make a merge conflict