Repair some merge problems