Collision detection
Merge fix