fix the bad merges