conflicts removed in routes.rb