From d1cf6806572118ce4b5a03f7327ef902c108d170 Mon Sep 17 00:00:00 2001
From: zihan987 <2910670457@qq.com>
Date: Wed, 4 Mar 2026 22:37:12 -0800
Subject: [PATCH] Resolve merge conflicts

---
 pkg/providers/openai_compat/provider.go | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkg/providers/openai_compat/provider.go b/pkg/providers/openai_compat/provider.go
index 8cd436795..372dfcbf6 100644
--- a/pkg/providers/openai_compat/provider.go
+++ b/pkg/providers/openai_compat/provider.go
@@ -361,11 +361,7 @@ func normalizeModel(model, apiBase string) string {
 
 	prefix := strings.ToLower(before)
 	switch prefix {
-<<<<<<< HEAD
-	case "moonshot", "nvidia", "groq", "ollama", "deepseek", "google", "openrouter", "zhipu", "mistral", "vivgrid":
-=======
-	case "litellm", "moonshot", "nvidia", "groq", "ollama", "deepseek", "google", "openrouter", "zhipu", "mistral":
->>>>>>> origin_picoclaw/main
+	case "litellm", "moonshot", "nvidia", "groq", "ollama", "deepseek", "google", "openrouter", "zhipu", "mistral", "vivgrid":
 		return after
 	default:
 		return model