Resolving conflicts in the merge