more merge conflicts in user model