bullet collisions
merge conflicts