Add a new test for using a custom merge strategy