Add Clash detection