diff --git a/src/main/java/UnitTest/OpenGaussReplicationToKafka.java b/src/main/java/UnitTest/OpenGaussReplicationToKafka.java
index 6c43158..f6dbcb9 100644
--- a/src/main/java/UnitTest/OpenGaussReplicationToKafka.java
+++ b/src/main/java/UnitTest/OpenGaussReplicationToKafka.java
@@ -188,30 +188,16 @@ public class OpenGaussReplicationToKafka {
 
 
         // 删除槽
-<<<<<<< HEAD
-
-
-=======
->>>>>>> 352d297806f35f93e0a702f9cbebc494170d1916
 //        DeleteSlot(slotName);
 
         // 创建槽
-
 //        CreateSlot(slotName);
-<<<<<<< HEAD
 
-
-=======
->>>>>>> 352d297806f35f93e0a702f9cbebc494170d1916
         // 查看槽
-
         //ListSlot();
-//        TruncateTable();
-<<<<<<< HEAD
 
+//       TruncateTable();
 
-=======
->>>>>>> 352d297806f35f93e0a702f9cbebc494170d1916
         //插入测试数据
 
 //        InsertTestData();