Fix routes.rb merge conflict