resolve the conflict

Signed-off-by: Ryan Leung <[email protected]>

server/server.go

@@ -425,21 +425,11 @@ func (s *Server) startServer(ctx context.Context) error {
 		Label:     idAllocLabel,
 		Member:    s.member.MemberValue(),
 	})
-<<<<<<< HEAD
-	regionStorage, err := storage.NewStorageWithLevelDBBackend(ctx, filepath.Join(s.cfg.DataDir, "region-meta"), s.encryptionKeyManager)
-=======
 	s.encryptionKeyManager, err = encryption.NewManager(s.client, &s.cfg.Security.Encryption)
 	if err != nil {
 		return err
 	}
-	// Initialize an etcd storage as the default storage.
-	defaultStorage := storage.NewStorageWithEtcdBackend(s.client, s.rootPath)
-	// Initialize a specialized LevelDB storage to store the region-related meta info independently.
-	regionStorage, err := storage.NewRegionStorageWithLevelDBBackend(
-		ctx,
-		filepath.Join(s.cfg.DataDir, "region-meta"),
-		s.encryptionKeyManager)
->>>>>>> c50993b2f (*: fix the initialization of encryption key manager (#8383))
+	regionStorage, err := storage.NewStorageWithLevelDBBackend(ctx, filepath.Join(s.cfg.DataDir, "region-meta"), s.encryptionKeyManager)
 	if err != nil {
 		return err
 	}
@@ -463,16 +453,7 @@ func (s *Server) startServer(ctx context.Context) error {
 		}
 	}
 
-<<<<<<< HEAD
-	s.encryptionKeyManager, err = encryption.NewManager(s.client, &s.cfg.Security.Encryption)
-	if err != nil {
-		return err
-	}
-
 	s.gcSafePointManager = gc.NewSafePointManager(s.storage)
-=======
-	s.gcSafePointManager = gc.NewSafePointManager(s.storage, s.cfg.PDServerCfg)
->>>>>>> c50993b2f (*: fix the initialization of encryption key manager (#8383))
 	s.basicCluster = core.NewBasicCluster()
 	s.cluster = cluster.NewRaftCluster(ctx, s.clusterID, syncer.NewRegionSyncer(s), s.client, s.httpClient)
 	keyspaceIDAllocator := id.NewAllocator(&id.AllocatorParams{