diff --git a/DEPS.bzl b/DEPS.bzl
index 6fefe8d7a514d..d232fff23c70e 100644
--- a/DEPS.bzl
+++ b/DEPS.bzl
@@ -6807,6 +6807,7 @@ def go_deps():
         name = "com_github_tikv_client_go_v2",
         build_file_proto_mode = "disable_global",
         importpath = "github.com/tikv/client-go/v2",
+<<<<<<< HEAD
         sha256 = "7e51e3bb9f1bea4b712c6fe7b4e24887b9a3d18e103f451d5f2d09f944015252",
         strip_prefix = "github.com/tikv/client-go/v2@v2.0.8-0.20240801083730-f8e321f39dd5",
         urls = [
@@ -6814,6 +6815,15 @@ def go_deps():
             "http://ats.apps.svc/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20240801083730-f8e321f39dd5.zip",
             "https://cache.hawkingrei.com/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20240801083730-f8e321f39dd5.zip",
             "https://storage.googleapis.com/pingcapmirror/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20240801083730-f8e321f39dd5.zip",
+=======
+        sha256 = "e8e46e4e470db6309d5c5132f3592334984fbc2614cd5c92372e1d72c7039c18",
+        strip_prefix = "github.com/tikv/client-go/v2@v2.0.8-0.20240801110226-cd64e24de8d1",
+        urls = [
+            "http://bazel-cache.pingcap.net:8080/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20240801110226-cd64e24de8d1.zip",
+            "http://ats.apps.svc/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20240801110226-cd64e24de8d1.zip",
+            "https://cache.hawkingrei.com/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20240801110226-cd64e24de8d1.zip",
+            "https://storage.googleapis.com/pingcapmirror/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20240801110226-cd64e24de8d1.zip",
+>>>>>>> 0a2d5be5a0d (*: update tikv/client-go for fix issue that store's liveness may incorrectly marked as unreachable when the store restarts with label changed (#55252))
         ],
     )
     go_repository(
diff --git a/go.mod b/go.mod
index 6f63688a13f18..155a817398f23 100644
--- a/go.mod
+++ b/go.mod
@@ -106,8 +106,13 @@ require (
 	github.com/tdakkota/asciicheck v0.2.0
 	github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2
 	github.com/tidwall/btree v1.7.0
+<<<<<<< HEAD
 	github.com/tikv/client-go/v2 v2.0.8-0.20240801083730-f8e321f39dd5
 	github.com/tikv/pd/client v0.0.0-20240806105739-10ecdbe92b55
+=======
+	github.com/tikv/client-go/v2 v2.0.8-0.20240801110226-cd64e24de8d1
+	github.com/tikv/pd/client v0.0.0-20240805092608-838ee7983b78
+>>>>>>> 0a2d5be5a0d (*: update tikv/client-go for fix issue that store's liveness may incorrectly marked as unreachable when the store restarts with label changed (#55252))
 	github.com/timakin/bodyclose v0.0.0-20240125160201-f835fa56326a
 	github.com/twmb/murmur3 v1.1.6
 	github.com/uber/jaeger-client-go v2.22.1+incompatible
diff --git a/go.sum b/go.sum
index 1fe7b4634beb5..5e630f4092eb6 100644
--- a/go.sum
+++ b/go.sum
@@ -784,10 +784,17 @@ github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a h1:J/YdBZ46WKpXsxsW
 github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a/go.mod h1:h4xBhSNtOeEosLJ4P7JyKXX7Cabg7AVkWCK5gV2vOrM=
 github.com/tidwall/btree v1.7.0 h1:L1fkJH/AuEh5zBnnBbmTwQ5Lt+bRJ5A8EWecslvo9iI=
 github.com/tidwall/btree v1.7.0/go.mod h1:twD9XRA5jj9VUQGELzDO4HPQTNJsoWWfYEL+EUQ2cKY=
+<<<<<<< HEAD
 github.com/tikv/client-go/v2 v2.0.8-0.20240801083730-f8e321f39dd5 h1:cXfHJBQg/sJSXJd9nNReDQGtR2Qou85JrxBQea3IhIk=
 github.com/tikv/client-go/v2 v2.0.8-0.20240801083730-f8e321f39dd5/go.mod h1:+vXk4Aex17GnI8gfSMPxrL0SQLbBYgP3Db4FvHiImwM=
 github.com/tikv/pd/client v0.0.0-20240806105739-10ecdbe92b55 h1:+1unfy0TcJJtud3d7BuYsvNG6tPVuXIH+WiIFhOx1Kc=
 github.com/tikv/pd/client v0.0.0-20240806105739-10ecdbe92b55/go.mod h1:1zqLOMhnkZIpBLj2oXOO2bWvtXhb12OmYr+cPkjQ6tI=
+=======
+github.com/tikv/client-go/v2 v2.0.8-0.20240801110226-cd64e24de8d1 h1:XjnK984mZUE2qiuI37gYWoWQdknLCo/fzsM7ZrotEF8=
+github.com/tikv/client-go/v2 v2.0.8-0.20240801110226-cd64e24de8d1/go.mod h1:4HDOAx8OXAJPtqhCZ03IhChXgaFs4B3+vSrPWmiPxjg=
+github.com/tikv/pd/client v0.0.0-20240805092608-838ee7983b78 h1:PtW+yTvs9eGTMblulaCHmJ5OtifuE4SJXCACCtkd6ko=
+github.com/tikv/pd/client v0.0.0-20240805092608-838ee7983b78/go.mod h1:TxrJRY949Vl14Lmarx6hTNP/HEDYzn4dP0KmjdzQ59w=
+>>>>>>> 0a2d5be5a0d (*: update tikv/client-go for fix issue that store's liveness may incorrectly marked as unreachable when the store restarts with label changed (#55252))
 github.com/timakin/bodyclose v0.0.0-20240125160201-f835fa56326a h1:A6uKudFIfAEpoPdaal3aSqGxBzLyU8TqyXImLwo6dIo=
 github.com/timakin/bodyclose v0.0.0-20240125160201-f835fa56326a/go.mod h1:mkjARE7Yr8qU23YcGMSALbIxTQ9r9QBVahQOBRfU460=
 github.com/tklauser/go-sysconf v0.3.9/go.mod h1:11DU/5sG7UexIrp/O6g35hrWzu0JxlwQ3LSFUzyeuhs=