resolve conflicts
Update user model