correct user.rb because of merge conflict