Attempt at Collision detection
Fix merge