fix epiceditor
fix epiceditor and merge stripe subscriptions