fix: merge conflict

source/libs/parser/src/parInsertSql.c

@@ -41,7 +41,7 @@ typedef struct SInsertParseContext {
   SParseContext* pComCxt;
   SMsgBuf        msg;
   char           tmpTokenBuf[TSDB_MAX_BYTES_PER_ROW];
-  SParsedDataColInfo tags;  // for stmt
+  SBoundColInfo  tags;  // for stmt
   bool           missCache;
   bool           usingDuplicateTable;
   bool           forceUpdate;
@@ -1846,13 +1846,11 @@ static int32_t setNextStageInfo(SInsertParseContext* pCxt, SQuery* pQuery, SCata
 }
 
 int32_t parseInsertSql(SParseContext* pCxt, SQuery** pQuery, SCatalogReq* pCatalogReq, const SMetaData* pMetaData) {
-  SInsertParseContext context = {
-      .pComCxt = pCxt,
+  SInsertParseContext context = {.pComCxt = pCxt,
                                  .msg = {.buf = pCxt->pMsg, .len = pCxt->msgLen},
                                  .missCache = false,
                                  .usingDuplicateTable = false,
-      .forceUpdate = (NULL != pCatalogReq ? pCatalogReq->forceUpdate : false)
-  };
+                                 .forceUpdate = (NULL != pCatalogReq ? pCatalogReq->forceUpdate : false)};
 
   int32_t code = initInsertQuery(&context, pCatalogReq, pMetaData, pQuery);
   if (TSDB_CODE_SUCCESS == code) {