From 36c36ee17974e2cf816b8e9a3b3eb0a9b2c05548 Mon Sep 17 00:00:00 2001
From: guo-shaoge <shaoge1994@163.com>
Date: Fri, 25 Jun 2021 14:17:15 +0800
Subject: [PATCH] fix conflicts

Signed-off-by: guo-shaoge <shaoge1994@163.com>
---
 expression/expression.go | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/expression/expression.go b/expression/expression.go
index 55c02d4baa9db..95bc45f72b6ad 100644
--- a/expression/expression.go
+++ b/expression/expression.go
@@ -1023,9 +1023,7 @@ func canFuncBePushed(sf *ScalarFunction, storeType kv.StoreType) bool {
 		// json functions.
 		ast.JSONType,
 		ast.JSONExtract,
-		// FIXME: JSONUnquote is incompatible with Coprocessor
-<<<<<<< HEAD
-		// ast.JSONUnquote,
+		ast.JSONUnquote,
 		ast.JSONObject,
 		ast.JSONArray,
 		ast.JSONMerge,
@@ -1034,9 +1032,6 @@ func canFuncBePushed(sf *ScalarFunction, storeType kv.StoreType) bool {
 		// ast.JSONReplace,
 		ast.JSONRemove,
 		ast.JSONLength,
-=======
-		ast.JSONUnquote,
->>>>>>> bd8d3b1a8... expression: uncomment pushdown for JSONUnquote expression (#24504)
 
 		// date functions.
 		ast.DateFormat,