Fix bad merging