Fix another merge conflict resolution problem