fixed merge conflict in routes.rb