update isClash method

NEEDS MORE TESTING!