diff --git a/src/query/src/qAggMain.c b/src/query/src/qAggMain.c
index b4b1cfd0c8fdc88a00256f40a612f0956a830178..019849bc0dda6950fba96145b8a69ce7e6475820 100644
--- a/src/query/src/qAggMain.c
+++ b/src/query/src/qAggMain.c
@@ -495,7 +495,6 @@ int32_t getResultDataInfo(int32_t dataType, int32_t dataBytes, int32_t functionI
 
 // TODO use hash table
 int32_t isValidFunction(const char* name, int32_t len) {
-<<<<<<< HEAD
 
   for (int32_t i = 0; i < TSDB_FUNC_SCALAR_MAX_NUM; ++i) {
     int32_t nameLen = (int32_t) strlen(aScalarFunctions[i].name);