Fix bad conflict