fix matched hits and conflict (not for the conflicts)