fixed unmerged file config/routes.rb