diff --git a/src/client/src/tscSystem.c b/src/client/src/tscSystem.c
index ac68d6e31d2134b84b83b950340b9398a4f3bfc2..27d23b8ee58631c98fe675a468c1f1938b1af440 100644
--- a/src/client/src/tscSystem.c
+++ b/src/client/src/tscSystem.c
@@ -223,7 +223,6 @@ void taos_cleanup(void) {
 
   taosCleanupKeywordsTable();
   taosCloseLog();
-<<<<<<< HEAD
 
   m = tscRpcCache; 
   if (m != NULL && atomic_val_compare_exchange_ptr(&tscRpcCache, m, 0) == m) {
@@ -235,8 +234,6 @@ void taos_cleanup(void) {
   }
 
   if (tscEmbedded == 0) rpcCleanup();
-=======
->>>>>>> ca3888c190d0415c151964a89652811e37089afd
 
   if (tscEmbedded == 0) {
     rpcCleanup();