From db7b8c711f6dee6f0334b97037ce46fb38f5ac5e Mon Sep 17 00:00:00 2001
From: TomShawn <41534398+TomShawn@users.noreply.github.com>
Date: Thu, 13 Oct 2022 13:25:21 +0800
Subject: [PATCH] Update aggregate-group-by-functions.md

---
 functions-and-operators/aggregate-group-by-functions.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/functions-and-operators/aggregate-group-by-functions.md b/functions-and-operators/aggregate-group-by-functions.md
index 51496b51eae3..b461c62558af 100644
--- a/functions-and-operators/aggregate-group-by-functions.md
+++ b/functions-and-operators/aggregate-group-by-functions.md
@@ -184,14 +184,12 @@ from tbl_name
 group by id, val;
 ```
 
-<<<<<<< HEAD
 ## TiDB 不支持的聚合函数
 
 TiDB 目前不支持的聚合函数如下所示，相关进展参阅 [TiDB #7623](https://github.com/pingcap/tidb/issues/7623)。
 
 - `JSON_ARRAYAGG`
-=======
+
 ## 相关系统变量
 
 `group_concat_max_len` 变量设置 `GROUP_CONCAT()` 函数中的最大项目数。
->>>>>>> 0c875e6a0 (sysvar: add 12 sysvars to docs-cn (#11495))