Fixed minor mapping errors

Fixed mapping error in FeedItem

Fixed merging error