A couple more graphic refactors
collide
CollisionMap
CollisionMap
CollisionMap
CollisionMap
conflict