Repaired conflict