Collision Detection with other people
Fix merge