user model merge conflict fix