Fixed collisions (again) no longer take damage from colliding
Merged changes