diff --git a/go.mod b/go.mod
index fafac35..e1c59ef 100644
--- a/go.mod
+++ b/go.mod
@@ -3,9 +3,9 @@ module go_blog
 go 1.20
 
 require (
-	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/gin-gonic/gin v1.9.1
 	github.com/go-ini/ini v1.67.0
+	github.com/golang-jwt/jwt v3.2.2+incompatible
 	github.com/gorilla/websocket v1.5.1
 	golang.org/x/crypto v0.25.0
 	gorm.io/driver/mysql v1.5.6
diff --git a/main.go b/main.go
index f1be391..77b1759 100644
--- a/main.go
+++ b/main.go
@@ -37,12 +37,7 @@ func init() {
 	flag.BoolVar(&isOrmDebug, "orm", true, "是否开启gorm的debug信息")
 	flag.Parse()
 
-<<<<<<< HEAD
-	//conf.SetUp()
-	conf.SetUp1()
-=======
 	conf.SetUp()
->>>>>>> c628419559368f0270c2573d91a06a1a9531d53a
 	models.SetUp(isOrmDebug)
 }