update point and velocity
resolve merge conflict