Untested:  Changing around some of the collision detection algorithm.
Resolving merge conflict in Bullet.cs