creating a merge conflict