collision handling improvement + add collisionResolve debug arrow