generating a merge conflict