diff --git a/pkg/keyspace/keyspace.go b/pkg/keyspace/keyspace.go
index 9eba14786d9..50c76f62485 100644
--- a/pkg/keyspace/keyspace.go
+++ b/pkg/keyspace/keyspace.go
@@ -31,11 +31,7 @@ import (
 	"github.com/tikv/pd/pkg/slice"
 	"github.com/tikv/pd/pkg/storage/endpoint"
 	"github.com/tikv/pd/pkg/storage/kv"
-<<<<<<< HEAD
-=======
-	"github.com/tikv/pd/pkg/utils/etcdutil"
 	"github.com/tikv/pd/pkg/utils/logutil"
->>>>>>> 2d8e03f33 (*: fix redact log (#8415))
 	"github.com/tikv/pd/pkg/utils/syncutil"
 	"go.uber.org/zap"
 )