Fix bad conflict fix