diff --git a/store/driver/tikv_driver.go b/store/driver/tikv_driver.go
index 532e6dd834173..86799ec84363c 100644
--- a/store/driver/tikv_driver.go
+++ b/store/driver/tikv_driver.go
@@ -18,11 +18,8 @@ import (
 	"context"
 	"crypto/tls"
 	"fmt"
-<<<<<<< HEAD:store/driver/tikv_driver.go
-	"math/rand"
-=======
 	"math"
->>>>>>> a5e07a2ed36 (store/driver: set `MaxCallRecvMsgSize` to `MaxInt32` for pd client (#56278)):pkg/store/driver/tikv_driver.go
+	"math/rand"
 	"net/url"
 	"strings"
 	"sync"