Collision stuff
Merge fixes