continued collisions
fixed conflicts