Integrating collisions into master branch