Collision detection, updated room file, etc.
Collision detection, pushing for VS errors
merging