Fix bug in routes.rb
Fix merge conflicts