diff --git a/internal/api/third/tencent_cloud_storage_credential.go b/internal/api/third/tencent_cloud_storage_credential.go
index a8a16d5cf..26ad0ec0f 100644
--- a/internal/api/third/tencent_cloud_storage_credential.go
+++ b/internal/api/third/tencent_cloud_storage_credential.go
@@ -6,14 +6,10 @@ import (
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/token_verify"
-<<<<<<< HEAD
-=======
+
 	"github.com/fatih/structs"
 
 	//"github.com/fatih/structs"
-	"github.com/gin-gonic/gin"
-	sts "github.com/tencentyun/qcloud-cos-sts-sdk/go"
->>>>>>> 17954df (Refactoring code)
 	"net/http"
 	"time"
 
diff --git a/script/build_all_service.sh b/script/build_all_service.sh
old mode 100644
new mode 100755