repaired conflicts