test of a merge conflict