further refine check-conflicts to avoid false positives