update user model
merge remote branch