Fixing bad merges