added vertical jump
merge fix