Remove check-overlap, it's duplicated by scan4dups.py
Ignore intentional conflicts in scan4dups.py