Resolved a merge conflict