This is an automated cherry-pick of pingcap#3091

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

Author: Oreoxmt

en/TOC.md

@@ -58,7 +58,15 @@
   - [Comparison Between TiDB Operator v2 and v1](v2-vs-v1.md)
   - Tools
     - [TiDB Toolkit](tidb-toolkit.md)
+<<<<<<< HEAD
 - Release Notes
   - v2.0
     - [2.0 GA](releases/release-2.0.0.md)
     - [2.0.0-beta.0](releases/release-2.0.0-beta.0.md)
+=======
+  - Configure
+    - [Configure tidb-drainer Chart](configure-tidb-binlog-drainer.md)
+  - [Log Collection](logs-collection.md)
+  - [Monitoring and Alert on Kubernetes](monitor-kubernetes.md)
+  - [PingCAP Clinic Diagnostic Data](clinic-data-collection.md)
+>>>>>>> 4bcf456e (remove release notes entry from TOC (#3091))

zh/TOC.md

@@ -58,7 +58,15 @@
   - [TiDB Operator v2 和 v1 的对比](v2-vs-v1.md)
   - 工具
     - [TiDB Toolkit](tidb-toolkit.md)
+<<<<<<< HEAD
 - 版本发布历史
   - v2.0
     - [2.0 GA](releases/release-2.0.0.md)
     - [2.0.0-beta.0](releases/release-2.0.0-beta.0.md)
+=======
+  - 配置
+    - [tidb-drainer chart 配置](configure-tidb-binlog-drainer.md)
+  - [日志收集](logs-collection.md)
+  - [Kubernetes 监控与告警](monitor-kubernetes.md)
+  - [PingCAP Clinic 数据采集范围说明](clinic-data-collection.md)
+>>>>>>> 4bcf456e (remove release notes entry from TOC (#3091))