updated user model, resolve git conflict