Surface collision detection
Resolve conflicts
Fix