not a merge conflict