Repair search conflict