Add NewsFeedRepository
Resolve Conflict