Fixed colflicting collisions

asdasdas