added team clash check