diff --git a/source/dnode/vnode/src/tsdb/tsdbOpen.c b/source/dnode/vnode/src/tsdb/tsdbOpen.c
index 58a22a6c7b..b2e4621878 100644
--- a/source/dnode/vnode/src/tsdb/tsdbOpen.c
+++ b/source/dnode/vnode/src/tsdb/tsdbOpen.c
@@ -19,7 +19,7 @@
 extern int32_t tsdbOpenCompMonitor(STsdb *tsdb);
 extern void    tsdbCloseCompMonitor(STsdb *tsdb);
 extern int32_t tsdbInitCompact();
-extern void    tsdbClearnupCompact();
+extern void    tsdbCleanupCompact();
 
 int32_t tsdbInit() {
 #ifdef TD_ENTERPRISE
@@ -30,7 +30,7 @@ int32_t tsdbInit() {
 
 void tsdbCleanUp() {
 #ifdef TD_ENTERPRISE
-  tsdbClearnupCompact();
+  tsdbCleanupCompact();
 #endif
   return;
 }
diff --git a/source/libs/nodes/src/nodesUtilFuncs.c b/source/libs/nodes/src/nodesUtilFuncs.c
index 0162fcc8fd..50f798bc23 100644
--- a/source/libs/nodes/src/nodesUtilFuncs.c
+++ b/source/libs/nodes/src/nodesUtilFuncs.c
@@ -470,11 +470,9 @@ int32_t nodesMakeNode(ENodeType type, SNode** ppNodeOut) {
     case QUERY_NODE_SET_OPERATOR:
       code = makeNode(type, sizeof(SSetOperator), &pNode);
       break;
-<<<<<<< HEAD
-=======
     case QUERY_NODE_RANGE_AROUND:
-      code = makeNode(type, sizeof(SRangeAroundNode), &pNode); break;
->>>>>>> feat/TS-4994-3.0
+      code = makeNode(type, sizeof(SRangeAroundNode), &pNode);
+      break;
     case QUERY_NODE_SELECT_STMT:
       code = makeNode(type, sizeof(SSelectStmt), &pNode);
       break;
diff --git a/source/libs/parser/inc/sql.y b/source/libs/parser/inc/sql.y
index 12712c7f92..cbfcd84670 100644
--- a/source/libs/parser/inc/sql.y
+++ b/source/libs/parser/inc/sql.y
@@ -342,8 +342,8 @@ integer_list(A) ::= integer_list(B) NK_COMMA NK_INTEGER(C).
 
 %type signed_integer_list                                                         { SNodeList* }
 %destructor signed_integer_list                                                   { nodesDestroyList($$); }
-signed_integer_list(A) ::= signed_integer(B).                                     { A = createNodeList(pCxt, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &B)); }
-signed_integer_list(A) ::= signed_integer_list(B) NK_COMMA signed_integer(C).     { A = addNodeToList(pCxt, B, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &C)); }
+signed_integer_list(A) ::= signed_integer(B).                                     { A = createNodeList(pCxt, B); }
+signed_integer_list(A) ::= signed_integer_list(B) NK_COMMA signed_integer(C).     { A = addNodeToList(pCxt, B, C); }
 
 %type variable_list                                                               { SNodeList* }
 %destructor variable_list                                                         { nodesDestroyList($$); }
@@ -352,8 +352,8 @@ variable_list(A) ::= variable_list(B) NK_COMMA NK_VARIABLE(C).
 
 %type signed_variable_list                                                        { SNodeList* }
 %destructor signed_variable_list                                                  { nodesDestroyList($$); }
-signed_variable_list(A) ::= NK_VARIABLE(B).                                              { A = createNodeList(pCxt, createDurationValueNode(pCxt, &B)); }
-signed_variable_list(A) ::= variable_list(B) NK_COMMA NK_VARIABLE(C).                    { A = addNodeToList(pCxt, B, createDurationValueNode(pCxt, &C)); }
+signed_variable_list(A) ::= signed_variable(B).                                   { A = createNodeList(pCxt, releaseRawExprNode(pCxt, B)); }
+signed_variable_list(A) ::= signed_variable_list(B) NK_COMMA signed_variable(C).  { A = addNodeToList(pCxt, B, releaseRawExprNode(pCxt, C)); }
 
 %type retention_list                                                              { SNodeList* }
 %destructor retention_list                                                        { nodesDestroyList($$); }