Testing a merge conflict