Major changes in refactoring and functionality of Collision Detector
fixed merge conflict