Collision resolution!

Merged in collision resolution.