Fix bad conflict merge