Fix conflic in user.rb