Repairing conflicts