Fix bad merges