merge and fix user.rb