Merge conflicts deleted.