diff --git a/pkg/audio/asr/asr.go b/pkg/audio/asr/asr.go
index 0837d4b55..d94bcf334 100644
--- a/pkg/audio/asr/asr.go
+++ b/pkg/audio/asr/asr.go
@@ -47,11 +47,15 @@ func supportsWhisperTranscription(modelCfg *config.ModelConfig) bool {
 	switch protocol {
 	case "openai", "litellm", "openrouter", "groq", "zhipu", "gemini", "nvidia",
 		"ollama", "moonshot", "shengsuanyun", "deepseek", "cerebras",
+<<<<<<< HEAD
 <<<<<<< HEAD
 		"vivgrid", "volcengine", "vllm", "qwen", "qwen-portal", "qwen-intl", "qwen-international", "dashscope-intl",
 =======
 		"vivgrid", "volcengine", "vllm", "ovms", "qwen", "qwen-intl", "qwen-international", "dashscope-intl",
 >>>>>>> 793357c6 (Add ovms support)
+=======
+		"vivgrid", "volcengine", "vllm", "ovms", "qwen", "qwen-intl", "qwen-international", "dashscope-intl",
+>>>>>>> 1cbec748785c37593377bc6b74bde7100dcce5a4
 		"qwen-us", "dashscope-us", "mistral", "avian", "minimax", "longcat", "modelscope", "novita",
 		"coding-plan", "alibaba-coding", "qwen-coding", "zai", "mimo":
 		return true