add FeedItem base class
fix merge conflicts