fixed conflicts in routes.rb