Added proper collision resolution
Fixing collisions