fixed merge conflicts in routes.rb