created subscription logic to save only good data, checked subscriptions persist
post-conflict resolution commit