More merge conflict resolution