fixed gravity
merge