fixed merged conflicts

Fixed conflicts in config/routes.rb master/login