updated routes
fixed merge conflicts in feed_helper and routes