fix unsubscribe
merging