diff --git a/src/config/api_ada_configs.py b/src/config/api_ada_configs.py
index b2cd195df..030b6dd43 100644
--- a/src/config/api_ada_configs.py
+++ b/src/config/api_ada_configs.py
@@ -126,132 +126,8 @@ class ModelTaskConfig(ValidatedConfigBase):
     emoji_vlm: TaskConfig = Field(..., description="表情包识别模型配置")
     anti_injection: TaskConfig = Field(..., description="反注入检测专用模型配置")
     
-<<<<<<< Updated upstream
-    # 可选配置项（有默认值） 
-    utils_small: TaskConfig = Field(
-        default_factory=lambda: TaskConfig(
-            model_list=["qwen3-8b"],
-            max_tokens=800,
-            temperature=0.7
-        ),
-        description="组件小模型配置"
-    )
-    replyer_1: TaskConfig = Field(
-        default_factory=lambda: TaskConfig(
-            model_list=["siliconflow-deepseek-v3"],
-            max_tokens=800,
-            temperature=0.2
-        ),
-        description="normal_chat首要回复模型模型配置"
-    )
-    replyer_2: TaskConfig = Field(
-        default_factory=lambda: TaskConfig(
-            model_list=["siliconflow-deepseek-v3"],
-            max_tokens=800,
-            temperature=0.7
-        ),
-        description="normal_chat次要回复模型配置"
-    )
-    maizone: TaskConfig = Field(
-        default_factory=lambda: TaskConfig(
-            model_list=["siliconflow-deepseek-v3"],
-            max_tokens=800,
-            temperature=0.3
-        ),
-        description="maizone专用模型"
-    )
-    emotion: TaskConfig = Field(
-        default_factory=lambda: TaskConfig(
-            model_list=["siliconflow-deepseek-v3"],
-            max_tokens=800,
-            temperature=0.7
-        ),
-        description="情绪模型配置"
-    )
-    mood: TaskConfig = Field(
-        default_factory=lambda: TaskConfig(
-            model_list=["siliconflow-deepseek-v3"],
-            max_tokens=800,
-            temperature=0.3
-        ),
-        description="心情模型配置"
-    )
-    vlm: TaskConfig = Field(
-        default_factory=lambda: TaskConfig(
-            model_list=["qwen2.5-vl-72b"],
-            max_tokens=1500,
-            temperature=0.3
-        ),
-        description="视觉语言模型配置"
-    )
-    voice: TaskConfig = Field(
-        default_factory=lambda: TaskConfig(
-            model_list=["siliconflow-deepseek-v3"],
-            max_tokens=800,
-            temperature=0.3
-        ),
-        description="语音识别模型配置"
-    )
-    tool_use: TaskConfig = Field(
-        default_factory=lambda: TaskConfig(
-            model_list=["siliconflow-deepseek-v3"],
-            max_tokens=800,
-            temperature=0.1
-        ),
-        description="专注工具使用模型配置"
-    )
-    planner: TaskConfig = Field(
-        default_factory=lambda: TaskConfig(
-            model_list=["siliconflow-deepseek-v3"],
-            max_tokens=800,
-            temperature=0.3
-        ),
-        description="规划模型配置"
-    )
-    embedding: TaskConfig = Field(
-        default_factory=lambda: TaskConfig(
-            model_list=["text-embedding-3-large"],
-            max_tokens=1024,
-            temperature=0.0
-        ),
-        description="嵌入模型配置"
-    )
-    lpmm_entity_extract: TaskConfig = Field(
-        default_factory=lambda: TaskConfig(
-            model_list=["siliconflow-deepseek-v3"],
-            max_tokens=2000,
-            temperature=0.1
-        ),
-        description="LPMM实体提取模型配置"
-    )
-    lpmm_rdf_build: TaskConfig = Field(
-        default_factory=lambda: TaskConfig(
-            model_list=["siliconflow-deepseek-v3"],
-            max_tokens=2000,
-            temperature=0.1
-        ),
-        description="LPMM RDF构建模型配置"
-    )
-    lpmm_qa: TaskConfig = Field(
-        default_factory=lambda: TaskConfig(
-            model_list=["siliconflow-deepseek-v3"],
-            max_tokens=2000,
-            temperature=0.3
-        ),
-        description="LPMM问答模型配置"
-    )
-    schedule_generator: TaskConfig = Field(
-        default_factory=lambda: TaskConfig(
-            model_list=["siliconflow-deepseek-v3"],
-            max_tokens=1500,
-            temperature=0.3
-        ),
-        description="日程生成模型配置"
-    )
-=======
     # 处理配置文件中命名不一致的问题
     utils_video: TaskConfig = Field(..., description="视频分析模型配置（兼容配置文件中的命名）")
->>>>>>> Stashed changes
 
     @property
     def video_analysis(self) -> TaskConfig: