Update bad merges