diff --git a/business/auth2/authprovider/dingding/staff.go b/business/auth2/authprovider/dingding/staff.go
index a0c78e440..0a35e29d7 100644
--- a/business/auth2/authprovider/dingding/staff.go
+++ b/business/auth2/authprovider/dingding/staff.go
@@ -22,10 +22,6 @@ func init() {
 }
 
 func (a *StaffAuther) VerifySecret(dummy, code string) (authBindEx *auth2.AuthBindEx, err error) {
-<<<<<<< HEAD
-
-=======
->>>>>>> b751c9442459defeaf01c6881116e08f1d8f0b47
 	userID, err := api.DingDingAPI.GetUserID(code)
 	if err == nil {
 		userDetail, err2 := api.DingDingAPI.GetUserDetail(userID.UserID)