Update with more changes to fix merge conflicts

app.py

@@ -57,9 +57,6 @@ def text2int_ep(content: Text = None):
     return JSONResponse(content=content)
 
 
-<<<<<<< HEAD
-@app.post("/manager")
-=======
 @app.post("/v1/manager")
 async def programmatic_message_manager(request: Request):
     """
@@ -94,7 +91,6 @@ async def programmatic_message_manager(request: Request):
 
 
 @app.post("/v2/manager")
->>>>>>> feature-wormhole
 async def programmatic_message_manager(request: Request):
     """
     Calls conversation management function to determine the next state

scripts/make_request.py

@@ -69,20 +69,13 @@ def run_simulated_request(endpoint, sample_answer, context=None):
 # run_simulated_request('nlu', 'eight, nine, ten')
 # run_simulated_request('nlu', '8, 9, 10')
 # run_simulated_request('nlu', '8')
-<<<<<<< HEAD
-run_simulated_request('nlu', "I don't know")
-=======
 # run_simulated_request('nlu', "I don't know")
->>>>>>> feature-wormhole
 # run_simulated_request('nlu', "I don't know eight")
 # run_simulated_request('nlu', "I don't 9")
 # run_simulated_request('nlu', "0.2")
 # run_simulated_request('nlu', 'Today is a wonderful day')
 # run_simulated_request('nlu', 'IDK 5?')
-<<<<<<< HEAD
-=======
 run_simulated_request('v2/manager', '')
->>>>>>> feature-wormhole
 # run_simulated_request('manager', '')
 # run_simulated_request('manager', 'add')
 # run_simulated_request('manager', 'subtract')