start on collision
added collisions
merge