Repair the conflict