Fix bad conflict merging