update user points
fixed merge conflicts