From 332f767a54665b86ca721e0bda95a5ce816530c5 Mon Sep 17 00:00:00 2001
From: Ryan Leung <rleungx@gmail.com>
Date: Tue, 6 Feb 2024 16:31:29 +0800
Subject: [PATCH] resolve the conflicts

Signed-off-by: Ryan Leung <rleungx@gmail.com>
---
 server/grpc_service.go | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/server/grpc_service.go b/server/grpc_service.go
index bd78a6845f0..c858a1f6161 100644
--- a/server/grpc_service.go
+++ b/server/grpc_service.go
@@ -1917,20 +1917,7 @@ func (s *GrpcServer) WatchGlobalConfig(req *pdpb.WatchGlobalConfigRequest, serve
 	if s.client == nil {
 		return ErrEtcdNotStarted
 	}
-<<<<<<< HEAD
-	ctx, cancel := context.WithCancel(s.Context())
-=======
-	if s.GetServiceMiddlewarePersistOptions().IsGRPCRateLimitEnabled() {
-		fName := currentFunction()
-		limiter := s.GetGRPCRateLimiter()
-		if done, err := limiter.Allow(fName); err == nil {
-			defer done()
-		} else {
-			return err
-		}
-	}
 	ctx, cancel := context.WithCancel(server.Context())
->>>>>>> 37be34ef1 (*: fix context usage when watch etcd (#7806))
 	defer cancel()
 	configPath := req.GetConfigPath()
 	if configPath == "" {