update user model
fix merge issue