diff --git a/src/routers/chat_router.py b/src/routers/chat_router.py
index 3f7d6117..ad136dde 100644
--- a/src/routers/chat_router.py
+++ b/src/routers/chat_router.py
@@ -72,12 +72,7 @@ def chat_post(
             chunk = make_chunk("", "searching", history=None)
             yield chunk
 
-<<<<<<< HEAD
-            meta["config"] = startup.config
-            new_query, refs = startup.retriever(query, history_manager.messages, meta)
-=======
             modified_query, refs = startup.retriever(modified_query, history_manager.messages, meta)
->>>>>>> feature/web_search
             refs_pool[cur_res_id] = refs
 
         messages = history_manager.get_history_with_msg(modified_query, max_rounds=meta.get('history_round'))
diff --git a/src/utils/web_search.py b/src/utils/web_search.py
index 7c5062b4..781e4553 100644
--- a/src/utils/web_search.py
+++ b/src/utils/web_search.py
@@ -7,7 +7,7 @@ logger = setup_logger("web-search")
 
 class WebSearcher:
     def __init__(self):
-        api_key = os.getenv("TAVILY_API_KEY", "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")
+        api_key = os.getenv("TAVILY_API_KEY")
         if not api_key:
             raise ValueError("TAVILY_API_KEY environment variable is not set")
         self.client = TavilyClient(api_key)