Revert "Revert "Revert "colliison logic"""

This reverts commit 1f15126eb26a13f29d73af20bbc7d740954a4826.