distinguishing Feeds from Sources
Merge branch 'feeds'