create a merge conflict