Fixed merge conflicts & basic bug in collider components