resolve conflict in routes.rb