added gravity vector
fixed conflict