add Subscription and Feed models
fix merge conflicts