diff --git a/src/client/src/tscParseLineProtocol.c b/src/client/src/tscParseLineProtocol.c
index 5a7de5fd5aa63f32b9a639b186b0f73c439166fe..f38e5a54d3c23f7dc0a019df8c228e875694233a 100644
--- a/src/client/src/tscParseLineProtocol.c
+++ b/src/client/src/tscParseLineProtocol.c
@@ -2096,8 +2096,13 @@ static int32_t parseSmlValue(TAOS_SML_KV *pKV, const char **index,
           back_slash = false;
           cur++;
           len++;
+<<<<<<< HEAD
           break;
         }
+=======
+	        break;
+	      }
+>>>>>>> 307bc006a5435ef382b94eba69ed50b225b483aa
 
         if (*cur == '"') {
           if (cur == *index) {