so many changes
adding a feed also adds a subscription
fix merge conflicts