diff --git a/QCloudCSharpSDK/COSXML/Common/CosVersion.cs b/QCloudCSharpSDK/COSXML/Common/CosVersion.cs
index a0323b0..dd5d09c 100644
--- a/QCloudCSharpSDK/COSXML/Common/CosVersion.cs
+++ b/QCloudCSharpSDK/COSXML/Common/CosVersion.cs
@@ -9,11 +9,7 @@ namespace COSXML.Common
 {
     public sealed class CosVersion
     {
-<<<<<<< HEAD
         private static string SDKVersion = "5.4.24.0";
-=======
-        private static string SDKVersion = "5.4.23.0";
->>>>>>> upstream/master
 
         public static string GetUserAgent()
         {
diff --git a/QCloudCSharpSDK/COSXMLTests/CITest.cs b/QCloudCSharpSDK/COSXMLTests/CITest.cs
index 1accfc6..27e74d4 100644
--- a/QCloudCSharpSDK/COSXMLTests/CITest.cs
+++ b/QCloudCSharpSDK/COSXMLTests/CITest.cs
@@ -411,7 +411,7 @@ public void TestVideoCensorJobCommit()
                 Assert.NotNull(result.censorJobsResponse.JobsDetail.State);
                 Assert.NotNull(result.censorJobsResponse.JobsDetail.CreationTime);
                 string id = result.censorJobsResponse.JobsDetail.JobId;
-                Thread.Sleep(60000);
+                Thread.Sleep(120000);
                 
                 // get video censor job
                 GetVideoCensorJobRequest getRequest = new GetVideoCensorJobRequest(bucket, id);