making a merge conflict