Apply suggestions from code review

en/backup-restore-cr.md

@@ -23,13 +23,8 @@ This section introduces the fields in the `Backup` CR.
         - If the BR version is specified in this field, such as `.spec.toolImage: pingcap/br:v7.1.1`, the image of the specified version is used for backup.
         - If an image is specified without the version, such as `.spec.toolImage: private/registry/br`, the `private/registry/br:${tikv_version}` image is used for backup.
     - When using Dumpling for backup, you can specify the Dumpling version in this field.
-<<<<<<< HEAD
-        - If the Dumpling version is specified in this field, such as `spec.toolImage: pingcap/dumpling:v7.1.0`, the image of the specified version is used for backup.
-        - If the field is not specified, the Dumpling version specified in `TOOLKIT_VERSION` of the [Backup Manager Dockerfile](https://github.com/pingcap/tidb-operator/blob/v1.5.0/images/tidb-backup-manager/Dockerfile) is used for backup by default.
-=======
         - If the Dumpling version is specified in this field, such as `spec.toolImage: pingcap/dumpling:v7.1.1`, the image of the specified version is used for backup.
-        - If the field is not specified, the Dumpling version specified in `TOOLKIT_VERSION` of the [Backup Manager Dockerfile](https://github.com/pingcap/tidb-operator/blob/master/images/tidb-backup-manager/Dockerfile) is used for backup by default.
->>>>>>> cf63ac66 (en,zh: Bump tidb components to v7.1.1 (#2432))
+        - If the field is not specified, the Dumpling version specified in `TOOLKIT_VERSION` of the [Backup Manager Dockerfile](https://github.com/pingcap/tidb-operator/blob/v1.5.0/images/tidb-backup-manager/Dockerfile) is used for backup by default.
 
 * `.spec.backupType`: the backup type. This field is valid only when you use BR for backup. Currently, the following three types are supported, and this field can be combined with the `.spec.tableFilter` field to configure table filter rules:
     * `full`: back up all databases in a TiDB cluster.
@@ -265,13 +260,8 @@ This section introduces the fields in the `Restore` CR.
 * `.spec.metadata.namespace`: the namespace where the `Restore` CR is located.
 * `.spec.toolImage`：the tools image used by `Restore`. TiDB Operator supports this configuration starting from v1.1.9.
 
-<<<<<<< HEAD
-    - When using BR for restoring, you can specify the BR version in this field. For example,`spec.toolImage: pingcap/br:v7.1.0`. If not specified, `pingcap/br:${tikv_version}` is used for restoring by default.
-    - When using Lightning for restoring, you can specify the Lightning version in this field. For example, `spec.toolImage: pingcap/lightning:v7.1.0`. If not specified, the Lightning version specified in `TOOLKIT_VERSION` of the [Backup Manager Dockerfile](https://github.com/pingcap/tidb-operator/blob/v1.5.0/images/tidb-backup-manager/Dockerfile) is used for restoring by default.
-=======
     - When using BR for restoring, you can specify the BR version in this field. For example,`spec.toolImage: pingcap/br:v7.1.1`. If not specified, `pingcap/br:${tikv_version}` is used for restoring by default.
-    - When using Lightning for restoring, you can specify the Lightning version in this field. For example, `spec.toolImage: pingcap/lightning:v7.1.1`. If not specified, the Lightning version specified in `TOOLKIT_VERSION` of the [Backup Manager Dockerfile](https://github.com/pingcap/tidb-operator/blob/master/images/tidb-backup-manager/Dockerfile) is used for restoring by default.
->>>>>>> cf63ac66 (en,zh: Bump tidb components to v7.1.1 (#2432))
+    - When using Lightning for restoring, you can specify the Lightning version in this field. For example, `spec.toolImage: pingcap/lightning:v7.1.1`. If not specified, the Lightning version specified in `TOOLKIT_VERSION` of the [Backup Manager Dockerfile](https://github.com/pingcap/tidb-operator/blob/v1.5.0/images/tidb-backup-manager/Dockerfile) is used for restoring by default.
 
 * `.spec.backupType`: the restore type. This field is valid only when you use BR to restore data. Currently, the following three types are supported, and this field can be combined with the `.spec.tableFilter` field to configure table filter rules:
     * `full`: restore all databases in a TiDB cluster.

en/deploy-on-general-kubernetes.md

@@ -52,13 +52,8 @@ This document describes how to deploy a TiDB cluster on general Kubernetes.
     pingcap/ticdc:v7.1.1
     pingcap/tiflash:v7.1.1
     pingcap/tidb-monitor-reloader:v1.0.1
-<<<<<<< HEAD
-    pingcap/tidb-monitor-initializer:v7.1.0
-    grafana/grafana:7.5.11
-=======
     pingcap/tidb-monitor-initializer:v7.1.1
-    grafana/grafana:6.0.1
->>>>>>> cf63ac66 (en,zh: Bump tidb components to v7.1.1 (#2432))
+    grafana/grafana:7.5.11
     prom/prometheus:v2.18.1
     busybox:1.26.2
     ```
@@ -75,13 +70,8 @@ This document describes how to deploy a TiDB cluster on general Kubernetes.
     docker pull pingcap/ticdc:v7.1.1
     docker pull pingcap/tiflash:v7.1.1
     docker pull pingcap/tidb-monitor-reloader:v1.0.1
-<<<<<<< HEAD
-    docker pull pingcap/tidb-monitor-initializer:v7.1.0
-    docker pull grafana/grafana:7.5.11
-=======
     docker pull pingcap/tidb-monitor-initializer:v7.1.1
-    docker pull grafana/grafana:6.0.1
->>>>>>> cf63ac66 (en,zh: Bump tidb components to v7.1.1 (#2432))
+    docker pull grafana/grafana:7.5.11
     docker pull prom/prometheus:v2.18.1
     docker pull busybox:1.26.2
 

zh/deploy-on-general-kubernetes.md

@@ -54,13 +54,8 @@ aliases: ['/docs-cn/tidb-in-kubernetes/dev/deploy-on-general-kubernetes/','/zh/t
     pingcap/ticdc:v7.1.1
     pingcap/tiflash:v7.1.1
     pingcap/tidb-monitor-reloader:v1.0.1
-<<<<<<< HEAD
-    pingcap/tidb-monitor-initializer:v7.1.0
-    grafana/grafana:7.5.11
-=======
     pingcap/tidb-monitor-initializer:v7.1.1
-    grafana/grafana:6.0.1
->>>>>>> cf63ac66 (en,zh: Bump tidb components to v7.1.1 (#2432))
+    grafana/grafana:7.5.11
     prom/prometheus:v2.18.1
     busybox:1.26.2
     ```
@@ -77,13 +72,8 @@ aliases: ['/docs-cn/tidb-in-kubernetes/dev/deploy-on-general-kubernetes/','/zh/t
     docker pull pingcap/ticdc:v7.1.1
     docker pull pingcap/tiflash:v7.1.1
     docker pull pingcap/tidb-monitor-reloader:v1.0.1
-<<<<<<< HEAD
-    docker pull pingcap/tidb-monitor-initializer:v7.1.0
-    docker pull grafana/grafana:7.5.11
-=======
     docker pull pingcap/tidb-monitor-initializer:v7.1.1
-    docker pull grafana/grafana:6.0.1
->>>>>>> cf63ac66 (en,zh: Bump tidb components to v7.1.1 (#2432))
+    docker pull grafana/grafana:7.5.11
     docker pull prom/prometheus:v2.18.1
     docker pull busybox:1.26.2
 
@@ -94,13 +84,8 @@ aliases: ['/docs-cn/tidb-in-kubernetes/dev/deploy-on-general-kubernetes/','/zh/t
     docker save -o ticdc-v7.1.1.tar pingcap/ticdc:v7.1.1
     docker save -o tiflash-v7.1.1.tar pingcap/tiflash:v7.1.1
     docker save -o tidb-monitor-reloader-v1.0.1.tar pingcap/tidb-monitor-reloader:v1.0.1
-<<<<<<< HEAD
-    docker save -o tidb-monitor-initializer-v7.1.0.tar pingcap/tidb-monitor-initializer:v7.1.0
-    docker save -o grafana-6.0.1.tar grafana/grafana:7.5.11
-=======
     docker save -o tidb-monitor-initializer-v7.1.1.tar pingcap/tidb-monitor-initializer:v7.1.1
-    docker save -o grafana-6.0.1.tar grafana/grafana:6.0.1
->>>>>>> cf63ac66 (en,zh: Bump tidb components to v7.1.1 (#2432))
+    docker save -o grafana-6.0.1.tar grafana/grafana:7.5.11
     docker save -o prometheus-v2.18.1.tar prom/prometheus:v2.18.1
     docker save -o busybox-1.26.2.tar busybox:1.26.2
     ```