Minor merge conflict resolution