Repair Merge Errors plus more.