added clash check