Started the initial newsfeed
Resolved the merge conflict