fixed indentation
fixed conflict
fixed a bug in extrapolate velocity