diff --git a/relay/relay_adaptor.go b/relay/relay_adaptor.go
index 6099385c8..406074c58 100644
--- a/relay/relay_adaptor.go
+++ b/relay/relay_adaptor.go
@@ -37,12 +37,8 @@ import (
 	"one-api/relay/channel/zhipu"
 	"one-api/relay/channel/zhipu_4v"
 	"strconv"
-<<<<<<< HEAD
     "one-api/relay/channel/submodel"
-=======
-
 	"github.com/gin-gonic/gin"
->>>>>>> 4f760a8d407d321bf7f011331ecffb2744b555fd
 )
 
 func GetAdaptor(apiType int) channel.Adaptor {