email subscriptions
email subscriptions
fixed merge issue