MR conflict fix

...avern/bridge_api_patterns/account_notifications.orig.json

...nd/tavern/bridge_api_patterns/get_account_posts.orig.json

hivemind/tavern/bridge_api_patterns/get_community.orig.json

...tavern/bridge_api_patterns/get_community_context.pat.json

hivemind/tavern/bridge_api_patterns/get_discussion.orig.json

...ind/tavern/bridge_api_patterns/get_payout_stats.orig.json

hivemind/tavern/bridge_api_patterns/get_post.orig.json

...mind/tavern/bridge_api_patterns/get_post_header.orig.json

hivemind/tavern/bridge_api_patterns/get_profile.orig.json

...ind/tavern/bridge_api_patterns/get_ranked_posts.orig.json

.../tavern/bridge_api_patterns/get_trending_topics.orig.json

...vern/bridge_api_patterns/list_all_subscriptions.orig.json

...ind/tavern/bridge_api_patterns/list_communities.orig.json

...tavern/bridge_api_patterns/list_community_roles.orig.json

.../tavern/bridge_api_patterns/list_pop_communities.pat.json

...ind/tavern/bridge_api_patterns/list_subscribers.orig.json

hivemind/tavern/bridge_api_patterns/normalize_post.pat.json

...d/tavern/bridge_api_patterns/post_notifications.orig.json

...tavern/bridge_api_patterns/unread_notifications.orig.json

.../condenser_api_patterns/get_account_reputations.orig.json