resolving merge conflict

Virtual-Josh · Virtual-Josh · commit c588020fd79c · 2019-12-09T11:33:00.000-08:00
diff --git a/samples/57.teams-conversation-bot/app.py b/samples/57.teams-conversation-bot/app.py
@@ -5,16 +5,26 @@
 import sys
 import uuid
 from datetime import datetime
+<<<<<<< HEAD
+=======
+from typing import Dict
+>>>>>>> cd9651bd29e2b15caa3ba1cb5912927f019f0085
 
 from flask import Flask, request, Response
 from botbuilder.core import (
     BotFrameworkAdapterSettings,
     TurnContext,
     BotFrameworkAdapter,
 )
+<<<<<<< HEAD
 from botbuilder.schema import Activity, ActivityTypes
 
 from bots import TeamsConversationBot
+=======
+from botbuilder.schema import Activity, ActivityTypes, ConversationReference
+
+from bots import ProactiveBot
+>>>>>>> cd9651bd29e2b15caa3ba1cb5912927f019f0085
 
 # Create the loop and Flask app
 LOOP = asyncio.get_event_loop()
