Collision resolution

-To fix: Entering corners