amend merge conflict in user.rb