diff --git a/config.py b/config.py
index ea244b20..1d23da2e 100644
--- a/config.py
+++ b/config.py
@@ -39,7 +39,6 @@ else:
     proxies = None
 
 # [step 3]>> 模型选择是 (注意: LLM_MODEL是默认选中的模型, 它*必须*被包含在AVAIL_LLM_MODELS列表中 )
-<<<<<<< HEAD
 LLM_MODEL = "gpt-3.5-turbo-16k" # 可选 ↓↓↓
 AVAIL_LLM_MODELS = ["qwen-max", "o1-mini", "o1-mini-2024-09-12", "o1", "o1-2024-12-17", "o1-preview", "o1-preview-2024-09-12",
                     "gpt-4-1106-preview", "gpt-4-turbo-preview", "gpt-4-vision-preview",
@@ -66,86 +65,6 @@ AVAIL_LLM_MODELS = ["qwen-max", "o1-mini", "o1-mini-2024-09-12", "o1", "o1-2024-
                     "THUDM/glm-4-9b-chat","Pro/THUDM/chatglm3-6b","Pro/THUDM/glm-4-9b-chat",
                     "meta-llama/Meta-Llama-3.1-405B-Instruct","meta-llama/Meta-Llama-3.1-70B-Instruct","meta-llama/Meta-Llama-3.1-8B-Instruct"
                     ]
-=======
-LLM_MODEL = "gpt-3.5-turbo-16k"  # 可选 ↓↓↓
-AVAIL_LLM_MODELS = [
-    "qwen-max",
-    "o1-mini",
-    "o1-mini-2024-09-12",
-    "o1",
-    "o1-2024-12-17",
-    "o1-preview",
-    "o1-preview-2024-09-12",
-    "gpt-4-1106-preview",
-    "gpt-4-turbo-preview",
-    "gpt-4-vision-preview",
-    "gpt-4o",
-    "gpt-4o-mini",
-    "gpt-4-turbo",
-    "gpt-4-turbo-2024-04-09",
-    "gpt-3.5-turbo-1106",
-    "gpt-3.5-turbo-16k",
-    "gpt-3.5-turbo",
-    "azure-gpt-3.5",
-    "gpt-4",
-    "gpt-4-32k",
-    "azure-gpt-4",
-    "glm-4",
-    "glm-4v",
-    "glm-3-turbo",
-    "gemini-1.5-pro",
-    "chatglm3",
-    "chatglm4",
-    "deepseek-chat",
-    "deepseek-coder",
-    "deepseek-reasoner",
-    "deepseek-ai/DeepSeek-R1",
-    "deepseek-ai/DeepSeek-V3",
-    "deepseek-ai/DeepSeek-R1-Distill-Llama-70B",
-    "eepseek-ai/DeepSeek-R1-Distill-Qwen-32B",
-    "deepseek-ai/DeepSeek-R1-Distill-Qwen-14B",
-    "deepseek-ai/DeepSeek-R1-Distill-Llama-8B",
-    "deepseek-ai/DeepSeek-R1-Distill-Qwen-7B",
-    "deepseek-ai/DeepSeek-R1-Distill-Qwen-1.5B",
-    "Pro/deepseek-ai/DeepSeek-R1-Distill-Llama-8B",
-    "Pro/deepseek-ai/DeepSeek-R1-Distill-Qwen-7B",
-    "Pro/deepseek-ai/DeepSeek-R1-Distill-Qwen-1.5B",
-    "meta-llama/Llama-3.3-70B-Instruct",
-    "AIDC-AI/Marco-o1",
-    "deepseek-ai/DeepSeek-V2.5",
-    "Qwen/Qwen2.5-72B-Instruct-128K",
-    "Qwen/Qwen2.5-72B-Instruct",
-    "Qwen/Qwen2.5-32B-Instruct",
-    "Qwen/Qwen2.5-14B-Instruct",
-    "Qwen/Qwen2.5-7B-Instruct",
-    "Qwen/Qwen2.5-Coder-32B-Instruct",
-    "Qwen/Qwen2.5-Coder-7B-Instruct",
-    "Qwen/Qwen2-7B-Instruct",
-    "Qwen/Qwen2-1.5B-Instruct",
-    "Qwen/QwQ-32B-Preview",
-    "TeleAI/TeleChat2",
-    "01-ai/Yi-1.5-34B-Chat-16K",
-    "01-ai/Yi-1.5-9B-Chat-16K",
-    "01-ai/Yi-1.5-6B-Chat",
-    "THUDM/glm-4-9b-chat",
-    "Vendor-A/Qwen/Qwen2.5-72B-Instruct",
-    "internlm/internlm2_5-7b-chat",
-    "internlm/internlm2_5-20b-chat",
-    "nvidia/Llama-3.1-Nemotron-70B-Instruct",
-    "meta-llama/Meta-Llama-3.1-405B-Instruct",
-    "meta-llama/Meta-Llama-3.1-70B-Instruct",
-    "meta-llama/Meta-Llama-3.1-8B-Instruct",
-    "google/gemma-2-27b-it",
-    "google/gemma-2-9b-it",
-    "Pro/Qwen/Qwen2.5-7B-Instruct",
-    "Pro/Qwen/Qwen2-7B-Instruct",
-    "Pro/Qwen/Qwen2-1.5B-Instruct",
-    "Pro/THUDM/chatglm3-6b",
-    "Pro/THUDM/glm-4-9b-chat",
-    "Pro/meta-llama/Meta-Llama-3.1-8B-Instruct",
-    "Pro/google/gemma-2-9b-it",
-]
->>>>>>> 3f94693e42f7601b77a569bce9193034dc22cc77
 
 EMBEDDING_MODEL = "text-embedding-3-small"