Add more precise conflict checks to conflicting_pair_finder.