Repair conflicts with new logic