fixing bug user.rb
 fixing merge conflcit