Fix bad conflict resolution.