add user.rb remember_token
fix merge