adding feeds and items
fixing merges