fixed add event subscription
Merge errors for subscriptions