diff --git a/offline-backend-20260512/backend/config.yaml b/offline-backend-20260512/backend/config.yaml
index 0f1baf03..47cf54f4 100644
--- a/offline-backend-20260512/backend/config.yaml
+++ b/offline-backend-20260512/backend/config.yaml
@@ -10,6 +10,7 @@ gateway:
   port: 8001
 
 models:
+<<<<<<< Updated upstream
   # - name: deepseek-chat
   #   display_name: DeepSeek Chat
   #   use: langchain_openai:ChatOpenAI
@@ -22,6 +23,20 @@ models:
   #   temperature: 1.0
   #   supports_vision: false
   #   supports_thinking: true
+=======
+  - name: deepseek-chat
+    display_name: DeepSeek Chat
+    use: langchain_openai:ChatOpenAI
+    model: deepseek-chat
+    api_key: sk-3fee562f834a4c08bb0d471ef44cb445
+    base_url: https://api.deepseek.com
+    request_timeout: 600.0
+    max_retries: 2
+    max_tokens: 4096
+    temperature: 1.0
+    supports_vision: false
+    supports_thinking: true
+>>>>>>> Stashed changes
 
   # - name: zai-org/GLM-5-FP8
   #   display_name: zai-org/GLM-5-FP8