diff --git a/lego/utils/codec/factory/factory_struct.go b/lego/utils/codec/factory/factory_struct.go
index b3f07a925..03efeb622 100644
--- a/lego/utils/codec/factory/factory_struct.go
+++ b/lego/utils/codec/factory/factory_struct.go
@@ -12,12 +12,6 @@ import (
 	"unicode"
 	"unsafe"
 
-<<<<<<< HEAD
-=======
-	"go_dreamfactory/lego/sys/log"
-	"go_dreamfactory/lego/utils/codec/codecore"
-
->>>>>>> 830997df434fe5d5d1769768c53efaa0caff2969
 	"github.com/modern-go/reflect2"
 )