resolve conflicts

TOC.md

@@ -4,7 +4,6 @@
 - Introduction
   - [TiDB Introduction](/overview.md)
   - Benchmarks
-<<<<<<< HEAD
     - [How to Test TiDB Using Sysbench](/benchmark/benchmark-tidb-using-sysbench.md)
     - [How to Run TPC-C Test on TiDB](/benchmark/benchmark-tidb-using-tpcc.md)
     - [Sysbench Performance Test - v3.0 vs. v2.1](/benchmark/v3.0-performance-benchmarking-with-sysbench.md)
@@ -62,242 +61,6 @@
     - [Memory Control](/configure-memory-usage.md)
     - [Placement Rules](/configure-placement-rules.md)
     - [Store Limit](/configure-store-limit.md)
-=======
-    - [v5.3 Sysbench Performance Test Report](/benchmark/benchmark-sysbench-v5.3.0-vs-v5.2.2.md)
-    - [v5.3 TPC-C Performance Test Report](/benchmark/v5.3-performance-benchmarking-with-tpcc.md)
-    - [v5.3 MPP mode TPC-H 100GB Performance Test](/benchmark/v5.3-performance-benchmarking-with-tpch.md)
-  - [MySQL Compatibility](/mysql-compatibility.md)
-  - [TiDB Limitations](/tidb-limitations.md)
-  - [TiDB Adopters](/adopters.md)
-  - [Credits](/credits.md)
-- Quick Start
-  - [Try Out TiDB](/quick-start-with-tidb.md)
-  - [Try Out HTAP](/quick-start-with-htap.md)
-  - [Learn TiDB SQL](/basic-sql-operations.md)
-  - [Learn HTAP](/explore-htap.md)
-  - [Import Example Database](/import-example-data.md)
-- Deploy
-  - [Software and Hardware Requirements](/hardware-and-software-requirements.md)
-  - [Environment Configuration Checklist](/check-before-deployment.md)
-  - Plan Cluster Topology
-    - [Minimal Topology](/minimal-deployment-topology.md)
-    - [TiFlash Topology](/tiflash-deployment-topology.md)
-    - [TiCDC Topology](/ticdc-deployment-topology.md)
-    - [TiDB Binlog Topology](/tidb-binlog-deployment-topology.md)
-    - [TiSpark Topology](/tispark-deployment-topology.md)
-    - [Cross-DC Topology](/geo-distributed-deployment-topology.md)
-    - [Hybrid Topology](/hybrid-deployment-topology.md)
-  - Install and Start
-    - [Use TiUP (Recommended)](/production-deployment-using-tiup.md)
-    - [Deploy in Kubernetes](/tidb-in-kubernetes.md)
-  - [Verify Cluster Status](/post-installation-check.md)
-  - Test Cluster Performance
-    - [Test TiDB Using Sysbench](/benchmark/benchmark-tidb-using-sysbench.md)
-    - [Test TiDB Using TPC-C](/benchmark/benchmark-tidb-using-tpcc.md)
-- Migrate
-  - [Overview](/migration-overview.md)
-  - Migrate from MySQL
-    - [Migrate from Amazon Aurora MySQL Using TiDB Lightning](/migrate-from-aurora-using-lightning.md)
-    - [Migrate from MySQL SQL Files Using TiDB Lightning](/migrate-from-mysql-dumpling-files.md)
-    - [Migrate from Amazon Aurora MySQL Using DM](/migrate-from-aurora-mysql-database.md)
-  - Migrate from CSV Files
-    - [Use TiDB Lightning](/tidb-lightning/migrate-from-csv-using-tidb-lightning.md)
-    - [Use `LOAD DATA` Statement](/sql-statements/sql-statement-load-data.md)
-  - [Migrate from SQL Files](/migrate-from-mysql-dumpling-files.md)
-  - [Replicate Incremental Data between TiDB Clusters in Real Time](/incremental-replication-between-clusters.md)
-- Maintain
-  - Upgrade
-    - [Use TiUP (Recommended)](/upgrade-tidb-using-tiup.md)
-    - [Use TiDB Operator](https://docs.pingcap.com/tidb-in-kubernetes/v1.1/upgrade-a-tidb-cluster)
-  - Scale
-    - [Use TiUP (Recommended)](/scale-tidb-using-tiup.md)
-    - [Use TiDB Operator](https://docs.pingcap.com/tidb-in-kubernetes/v1.1/scale-a-tidb-cluster)
-  - Backup and Restore
-    - Use BR Tool (Recommended)
-      - [BR Tool Overview](/br/backup-and-restore-tool.md)
-      - [Use BR Command-line for Backup and Restoration](/br/use-br-command-line-tool.md)
-      - [BR Use Cases](/br/backup-and-restore-use-cases.md)
-      - [External Storages](/br/backup-and-restore-storages.md)
-      - [BR FAQ](/br/backup-and-restore-faq.md)
-  - [Configure Time Zone](/configure-time-zone.md)
-  - [Daily Checklist](/daily-check.md)
-  - [Maintain TiFlash](/tiflash/maintain-tiflash.md)
-  - [Maintain TiDB Using TiUP](/maintain-tidb-using-tiup.md)
-  - [Modify Configuration Online](/dynamic-config.md)
-  - [Online Unsafe Recovery](/online-unsafe-recovery.md)
-- Monitor and Alert
-  - [Monitoring Framework Overview](/tidb-monitoring-framework.md)
-  - [Monitoring API](/tidb-monitoring-api.md)
-  - [Deploy Monitoring Services](/deploy-monitoring-services.md)
-  - [Export Grafana Snapshots](/exporting-grafana-snapshots.md)
-  - [TiDB Cluster Alert Rules](/alert-rules.md)
-  - [TiFlash Alert Rules](/tiflash/tiflash-alert-rules.md)
-- Troubleshoot
-  - [TiDB Troubleshooting Map](/tidb-troubleshooting-map.md)
-  - [Identify Slow Queries](/identify-slow-queries.md)
-  - [Analyze Slow Queries](/analyze-slow-queries.md)
-  - [SQL Diagnostics](/information-schema/information-schema-sql-diagnostics.md)
-  - [Identify Expensive Queries](/identify-expensive-queries.md)
-  - [Statement Summary Tables](/statement-summary-tables.md)
-  - [Troubleshoot Hotspot Issues](/troubleshoot-hot-spot-issues.md)
-  - [Troubleshoot Increased Read and Write Latency](/troubleshoot-cpu-issues.md)
-  - [Save and Restore the On-Site Information of a Cluster](/sql-plan-replayer.md)
-  - [Troubleshoot Cluster Setup](/troubleshoot-tidb-cluster.md)
-  - [Troubleshoot High Disk I/O Usage](/troubleshoot-high-disk-io.md)
-  - [Troubleshoot Lock Conflicts](/troubleshoot-lock-conflicts.md)
-  - [Troubleshoot TiFlash](/tiflash/troubleshoot-tiflash.md)
-  - [Troubleshoot Write Conflicts in Optimistic Transactions](/troubleshoot-write-conflicts.md)
-- Performance Tuning
-  - System Tuning
-    - [Operating System Tuning](/tune-operating-system.md)
-  - Software Tuning
-    - Configuration
-      - [Tune TiDB Memory](/configure-memory-usage.md)
-      - [Tune TiKV Threads](/tune-tikv-thread-performance.md)
-      - [Tune TiKV Memory](/tune-tikv-memory-performance.md)
-      - [TiKV Follower Read](/follower-read.md)
-      - [TiFlash Tuning](/tiflash/tune-tiflash-performance.md)
-    - [Coprocessor Cache](/coprocessor-cache.md)
-  - SQL Tuning
-    - [Overview](/sql-tuning-overview.md)
-    - Understanding the Query Execution Plan
-      - [Overview](/explain-overview.md)
-      - [`EXPLAIN` Walkthrough](/explain-walkthrough.md)
-      - [Indexes](/explain-indexes.md)
-      - [Joins](/explain-joins.md)
-      - [MPP Queries](/explain-mpp.md)
-      - [Subqueries](/explain-subqueries.md)
-      - [Aggregation](/explain-aggregation.md)
-      - [Views](/explain-views.md)
-      - [Partitions](/explain-partitions.md)
-    - SQL Optimization Process
-      - [Overview](/sql-optimization-concepts.md)
-      - Logic Optimization
-        - [Overview](/sql-logical-optimization.md)
-        - [Subquery Related Optimizations](/subquery-optimization.md)
-        - [Column Pruning](/column-pruning.md)
-        - [Decorrelation of Correlated Subquery](/correlated-subquery-optimization.md)
-        - [Eliminate Max/Min](/max-min-eliminate.md)
-        - [Predicates Push Down](/predicate-push-down.md)
-        - [Partition Pruning](/partition-pruning.md)
-        - [TopN and Limit Push Down](/topn-limit-push-down.md)
-        - [Join Reorder](/join-reorder.md)
-      - Physical Optimization
-        - [Overview](/sql-physical-optimization.md)
-        - [Index Selection](/choose-index.md)
-        - [Statistics](/statistics.md)
-        - [Wrong Index Solution](/wrong-index-solution.md)
-        - [Distinct Optimization](/agg-distinct-optimization.md)
-      - [Prepare Execution Plan Cache](/sql-prepare-plan-cache.md)
-    - Control Execution Plans
-      - [Overview](/control-execution-plan.md)
-      - [Optimizer Hints](/optimizer-hints.md)
-      - [SQL Plan Management](/sql-plan-management.md)
-      - [The Blocklist of Optimization Rules and Expression Pushdown](/blocklist-control-plan.md)
-- Tutorials
-  - [Multiple Data Centers in One City Deployment](/multi-data-centers-in-one-city-deployment.md)
-  - [Three Data Centers in Two Cities Deployment](/three-data-centers-in-two-cities-deployment.md)
-  - [Two Data Centers in One City Deployment](/two-data-centers-in-one-city-deployment.md)
-  - Read Historical Data
-    - Use Stale Read (Recommended)
-      - [Usage Scenarios of Stale Read](/stale-read.md)
-      - [Perform Stale Read Using `As OF TIMESTAMP`](/as-of-timestamp.md)
-    - [Use the `tidb_snapshot` System Variable](/read-historical-data.md)
-  - Best Practices
-    - [Use TiDB](/best-practices/tidb-best-practices.md)
-    - [Java Application Development](/best-practices/java-app-best-practices.md)
-    - [Use HAProxy](/best-practices/haproxy-best-practices.md)
-    - [Highly Concurrent Write](/best-practices/high-concurrency-best-practices.md)
-    - [Grafana Monitoring](/best-practices/grafana-monitor-best-practices.md)
-    - [PD Scheduling](/best-practices/pd-scheduling-best-practices.md)
-    - [TiKV Performance Tuning with Massive Regions](/best-practices/massive-regions-best-practices.md)
-    - [Three-node Hybrid Deployment](/best-practices/three-nodes-hybrid-deployment.md)
-    - [Local Read Under Three Data Centers Deployment](/best-practices/three-dc-local-read.md)
-  - [Use Placement Rules](/configure-placement-rules.md)
-  - [Use Load Base Split](/configure-load-base-split.md)
-  - [Use Store Limit](/configure-store-limit.md)
-- TiDB Ecosystem Tools
-  - [Overview](/ecosystem-tool-user-guide.md)
-  - [Use Cases](/ecosystem-tool-user-case.md)
-  - [Download](/download-ecosystem-tools.md)
-  - Backup & Restore (BR)
-    - [BR Tool Overview](/br/backup-and-restore-tool.md)
-    - [Use BR Command-line for Backup and Restoration](/br/use-br-command-line-tool.md)
-    - [BR Use Cases](/br/backup-and-restore-use-cases.md)
-    - [External Storages](/br/backup-and-restore-storages.md)
-    - [BR FAQ](/br/backup-and-restore-faq.md)
-  - TiDB Binlog
-    - [Overview](/tidb-binlog/tidb-binlog-overview.md)
-    - [Quick Start](/tidb-binlog/get-started-with-tidb-binlog.md)
-    - [Deploy](/tidb-binlog/deploy-tidb-binlog.md)
-    - [Maintain](/tidb-binlog/maintain-tidb-binlog-cluster.md)
-    - [Configure](/tidb-binlog/tidb-binlog-configuration-file.md)
-      - [Pump](/tidb-binlog/tidb-binlog-configuration-file.md#pump)
-      - [Drainer](/tidb-binlog/tidb-binlog-configuration-file.md#drainer)
-    - [Upgrade](/tidb-binlog/upgrade-tidb-binlog.md)
-    - [Monitor](/tidb-binlog/monitor-tidb-binlog-cluster.md)
-    - [Reparo](/tidb-binlog/tidb-binlog-reparo.md)
-    - [binlogctl](/tidb-binlog/binlog-control.md)
-    - [Binlog Consumer Client](/tidb-binlog/binlog-consumer-client.md)
-    - [TiDB Binlog Relay Log](/tidb-binlog/tidb-binlog-relay-log.md)
-    - [Bidirectional Replication Between TiDB Clusters](/tidb-binlog/bidirectional-replication-between-tidb-clusters.md)
-    - [Glossary](/tidb-binlog/tidb-binlog-glossary.md)
-    - Troubleshoot
-      - [Troubleshoot](/tidb-binlog/troubleshoot-tidb-binlog.md)
-      - [Handle Errors](/tidb-binlog/handle-tidb-binlog-errors.md)
-    - [FAQ](/tidb-binlog/tidb-binlog-faq.md)
-  - TiDB Lightning
-    - [Overview](/tidb-lightning/tidb-lightning-overview.md)
-    - [Tutorial](/get-started-with-tidb-lightning.md)
-    - [Deploy](/tidb-lightning/deploy-tidb-lightning.md)
-    - [Precheck](/tidb-lightning/tidb-lightning-prechecks.md)
-    - [Configure](/tidb-lightning/tidb-lightning-configuration.md)
-  - [TiDB Data Migration](/dm/dm-overview.md)
-    - Key Features
-      - [Checkpoints](/tidb-lightning/tidb-lightning-checkpoints.md)
-      - [Table Filter](/table-filter.md)
-      - [CSV Support](/tidb-lightning/migrate-from-csv-using-tidb-lightning.md)
-      - [Backends](/tidb-lightning/tidb-lightning-backends.md)
-      - [Import Data in Parallel](/tidb-lightning/tidb-lightning-distributed-import.md)
-      - [Web Interface](/tidb-lightning/tidb-lightning-web-interface.md)
-    - [Monitor](/tidb-lightning/monitor-tidb-lightning.md)
-    - [FAQ](/tidb-lightning/tidb-lightning-faq.md)
-    - [Glossary](/tidb-lightning/tidb-lightning-glossary.md)
-  - TiCDC
-    - [Overview](/ticdc/ticdc-overview.md)
-    - [Deploy](/ticdc/deploy-ticdc.md)
-    - [Maintain](/ticdc/manage-ticdc.md)
-    - [Troubleshoot](/ticdc/troubleshoot-ticdc.md)
-    - [Monitor](/ticdc/monitor-ticdc.md)
-    - [Alert Rules](/ticdc/ticdc-alert-rules.md)
-    - [TiCDC OpenAPI](/ticdc/ticdc-open-api.md)
-    - [TiCDC Open Protocol](/ticdc/ticdc-open-protocol.md)
-    - [Integrate TiDB with Confluent Platform](/ticdc/integrate-confluent-using-ticdc.md)
-    - [Glossary](/ticdc/ticdc-glossary.md)
-  - [Dumpling](/dumpling-overview.md)
-  - sync-diff-inspector
-    - [Overview](/sync-diff-inspector/sync-diff-inspector-overview.md)
-    - [Data Check for Tables with Different Schema/Table Names](/sync-diff-inspector/route-diff.md)
-    - [Data Check in the Sharding Scenario](/sync-diff-inspector/shard-diff.md)
-    - [Data Check for TiDB Upstream/Downstream Clusters](/sync-diff-inspector/upstream-downstream-diff.md)
-    - [Data Check in the DM Replication Scenario](/sync-diff-inspector/dm-diff.md)
-  - TiSpark
-    - [Quick Start](/get-started-with-tispark.md)
-    - [User Guide](/tispark-overview.md)
-- Reference
-  - Cluster Architecture
-    - [Overview](/tidb-architecture.md)
-    - [Storage](/tidb-storage.md)
-    - [Computing](/tidb-computing.md)
-    - [Scheduling](/tidb-scheduling.md)
-  - Key Monitoring Metrics
-    - [Overview](/grafana-overview-dashboard.md)
-    - [TiDB](/grafana-tidb-dashboard.md)
-    - [PD](/grafana-pd-dashboard.md)
-    - [TiKV](/grafana-tikv-dashboard.md)
-    - [TiFlash](/tiflash/monitor-tiflash.md)
-    - [TiCDC](/ticdc/monitor-ticdc.md)
->>>>>>> 164d243d8 (New docs: add new entry for TiDB DM and TiDB in Kubernetes (#7166))
   - Secure
     - Transport Layer Security (TLS)
       - [Enable TLS For MySQL Clients](/encrypted-connections-with-tls-protocols.md)
@@ -599,7 +362,7 @@
     - [Mydumper](/mydumper-overview.md)
     - [Syncer](/syncer-overview.md)
     - [Loader](/loader-overview.md)
-    - [Data Migration](https://pingcap.com/docs/tidb-data-migration/stable/)
+    - [Data Migration](/dm/dm-overview.md)
     - TiDB Lightning
       - [Overview](/tidb-lightning/tidb-lightning-overview.md)
       - [Deployment](/tidb-lightning/deploy-tidb-lightning.md)
@@ -622,7 +385,7 @@
     - [PD Recover](/pd-recover.md)
     - [TiKV Control](/tikv-control.md)
     - [TiDB Control](/tidb-control.md)
-- [TiDB in Kubernetes](https://pingcap.com/docs/tidb-in-kubernetes/stable/)
+- [TiDB in Kubernetes](/tidb-in-kubernetes.md)
 - FAQs
   - [TiDB FAQs](/faq/tidb-faq.md)
   - [TiDB Lightning FAQs](/tidb-lightning/tidb-lightning-faq.md)

tidb-in-kubernetes.md

@@ -8,6 +8,9 @@ aliases: ['/docs/tidb-in-kubernetes/dev/']
 
 You can use [TiDB Operator](https://github.com/pingcap/tidb-operator) to deploy TiDB clusters in Kubernetes. TiDB Operator is an automatic operation system for TiDB clusters in Kubernetes. It provides full life-cycle management for TiDB including deployment, upgrades, scaling, backup, fail-over, and configuration changes. With TiDB Operator, TiDB can run seamlessly in the Kubernetes clusters deployed on a public or private cloud.
 
-For the current TiDB release, the compatible version of TiDB Operator is v1.2.
+For the current TiDB release, the compatible versions of TiDB Operator include v1.2 and v1.1. It is recommended to use TiDB Operator v1.2.
 
-Currently, the TiDB in Kubernetes documentation is independent of the TiDB documentation. For detailed steps on how to deploy TiDB clusters in Kubernetes using TiDB Operator, see [TiDB in Kubernetes documentation](https://docs.pingcap.com/tidb-in-kubernetes/v1.2/).
+Currently, the TiDB in Kubernetes documentation is independent of the TiDB documentation. For detailed steps on how to deploy TiDB clusters in Kubernetes using TiDB Operator, see the following links:
+
+- [TiDB in Kubernetes documentation for TiDB Operator v1.2](https://docs.pingcap.com/tidb-in-kubernetes/v1.2/)
+- [TiDB in Kubernetes documentation for TiDB Operator v1.1](https://docs.pingcap.com/tidb-in-kubernetes/v1.1/)