diff --git a/app/lib/smooch_nlu.rb b/app/lib/smooch_nlu.rb
index e1b8b0d33..bf9566b81 100644
--- a/app/lib/smooch_nlu.rb
+++ b/app/lib/smooch_nlu.rb
@@ -87,7 +87,11 @@ def self.alegre_matches_from_message(message, language, context, alegre_result_k
           language: language,
         }.merge(context)
       }
+<<<<<<< HEAD
       response = Bot::Alegre.get_sync_with_params(params, "text")
+=======
+      response = Bot::Alegre.get_sync_raw_params(params, "text")
+>>>>>>> 7c7cdd38d (rebase)
 
       # One approach would be to take the option that has the most matches
       # Unfortunately this approach is influenced by the number of keywords per option