Fix merge more conflicts

mathtext_fastapi/nlu.py

@@ -155,17 +155,6 @@ def evaluate_message_with_nlu(message_data):
         predicted_label = predict_message_intent(message_text)
         if predicted_label['confidence'] > 0.01:
             nlu_response = predicted_label
-<<<<<<< HEAD
-            return nlu_response
-
-        # Run sentiment analysis
-        sentiment_api_resp = sentiment(message_text)
-        nlu_response = build_nlu_response_object(
-            'sentiment',
-            sentiment_api_resp[0]['label'],
-            sentiment_api_resp[0]['score']
-        )
-=======
         else:
             # Run sentiment analysis
             sentiment_api_resp = sentiment(message_text)
@@ -174,7 +163,6 @@ def evaluate_message_with_nlu(message_data):
                 sentiment_api_resp[0]['label'],
                 sentiment_api_resp[0]['score']
             )
->>>>>>> feature-wormhole
     else:
         nlu_response = build_nlu_response_object(
             'integer',