Adding Rock Provider
git merge in collision manager.