Fix bad merge results