Fix bad conflict resolution