Resolving a merge conflict