merge conflict fix in user.rb