Pull and fix a merge conflict