subscriptions module markup
resolve conflict