Correct bad conflict resolution in previous merge