Collision resolution

still doesn't work