Patched up collision

Changes:
- Collision works for x direction but is still messed up for y direction
Merge conflicts