where is the merge conflict?