Fix bad conflict resolution!