resolved a merge conflict