Made changes to routes.rb
fixed conflicts in the routes.rb file