Fixing merge conflicts in CollisionObject.cpp and main.cpp
Fixing merge with main.cpp