diff --git a/benchmark/benchmark-sysbench-v4-vs-v3.md b/benchmark/benchmark-sysbench-v4-vs-v3.md
index 147d53897033f..1c997eb2b8316 100644
--- a/benchmark/benchmark-sysbench-v4-vs-v3.md
+++ b/benchmark/benchmark-sysbench-v4-vs-v3.md
@@ -80,7 +80,6 @@ raftstore.apply-pool-size: 3
 rocksdb.max-background-jobs: 3
 raftdb.max-background-jobs: 3
 raftdb.allow-concurrent-memtable-write: true
-server.request-batch-enable-cross-command: false
 server.grpc-concurrency: 6
 readpool.unified.min-thread-count: 5
 readpool.unified.max-thread-count: 20
diff --git a/benchmark/benchmark-sysbench-v5-vs-v4.md b/benchmark/benchmark-sysbench-v5-vs-v4.md
index 7ba96dc5aacc5..871f05eb90c90 100644
--- a/benchmark/benchmark-sysbench-v5-vs-v4.md
+++ b/benchmark/benchmark-sysbench-v5-vs-v4.md
@@ -52,7 +52,6 @@ raftstore.apply-pool-size: 3
 rocksdb.max-background-jobs: 3
 raftdb.max-background-jobs: 3
 raftdb.allow-concurrent-memtable-write: true
-server.request-batch-enable-cross-command: false
 server.grpc-concurrency: 6
 readpool.unified.min-thread-count: 5
 readpool.unified.max-thread-count: 20
diff --git a/benchmark/v4.0-performance-benchmarking-with-tpcc.md b/benchmark/v4.0-performance-benchmarking-with-tpcc.md
index 6938bc06dfc9e..3a75477e64633 100644
--- a/benchmark/v4.0-performance-benchmarking-with-tpcc.md
+++ b/benchmark/v4.0-performance-benchmarking-with-tpcc.md
@@ -80,7 +80,6 @@ raftstore.apply-pool-size: 3
 rocksdb.max-background-jobs: 3
 raftdb.max-background-jobs: 3
 raftdb.allow-concurrent-memtable-write: true
-server.request-batch-enable-cross-command: false
 server.grpc-concurrency: 6
 readpool.unified.min-thread-count: 5
 readpool.unified.max-thread-count: 20
diff --git a/benchmark/v5.0-performance-benchmarking-with-tpcc.md b/benchmark/v5.0-performance-benchmarking-with-tpcc.md
index 62dcdbddc451d..e408a9cfedca0 100644
--- a/benchmark/v5.0-performance-benchmarking-with-tpcc.md
+++ b/benchmark/v5.0-performance-benchmarking-with-tpcc.md
@@ -58,7 +58,6 @@ readpool.unified.max-thread-count: 20
 readpool.unified.min-thread-count: 5
 rocksdb.max-background-jobs: 8
 server.grpc-concurrency: 6
-server.request-batch-enable-cross-command: false
 storage.scheduler-worker-pool-size: 20
 ```
 
diff --git a/upgrade-tidb-using-tiup.md b/upgrade-tidb-using-tiup.md
index 6531e59f2a73b..7763c0265d311 100644
--- a/upgrade-tidb-using-tiup.md
+++ b/upgrade-tidb-using-tiup.md
@@ -106,6 +106,7 @@ Now, the offline mirror has been upgraded successfully. If an error occurs durin
 
 > **Note:**
 >
+<<<<<<< HEAD
 > Before you upgrade the cluster to v5.0, make sure that the parameters you have modified in v4.0 are compatible in v5.0. For details, see [TiKV Configuration File](/tikv-configuration-file.md).
 >
 > The following three TiKV parameters are obsolete in TiDB v5.0. If the following parameters have been configured in your original cluster, you need to delete these parameters through `edit-config`:
@@ -113,6 +114,9 @@ Now, the offline mirror has been upgraded successfully. If an error occurs durin
 > - pessimistic-txn.enabled
 > - server.request-batch-enable-cross-command
 > - server.request-batch-wait-duration
+=======
+> Before you upgrade the cluster to v6.4.0, make sure that the parameters you have modified in v4.0 are compatible in v6.4.0. For details, see [TiKV Configuration File](/tikv-configuration-file.md).
+>>>>>>> 288076c20 (Delete 3 tidb configs that have been deleted in code (#11645))
 
 ### Step 3: Check the health status of the current cluster