was a merge conflict