Rerouted the comments
Fixed merge conflicts in routes.rb