collisions & jumping works
merge