diff --git a/tidb-cloud/branch-github-integration.md b/tidb-cloud/branch-github-integration.md
index 144b3ccfe2026..ed06d698ac399 100644
--- a/tidb-cloud/branch-github-integration.md
+++ b/tidb-cloud/branch-github-integration.md
@@ -40,7 +40,11 @@ To integrate TiDB Serverless branching with your GitHub repository, take the fol
- If you have not logged into GitHub, you will be asked to log into GitHub first.
- If it is the first time you use the integration, you will be asked to authorize the **TiDB Cloud Branching** app.
+<<<<<<< HEAD

+=======
+
+>>>>>>> 6efd9be235 (update media resource links to point to new locations (#20415))
4. In the **Connect to GitHub** dialog, select a GitHub account in the **GitHub Account** drop-down list.
@@ -50,7 +54,11 @@ To integrate TiDB Serverless branching with your GitHub repository, take the fol
6. Click **Connect** to connect between your TiDB Serverless cluster and your GitHub repository.
+<<<<<<< HEAD

+=======
+
+>>>>>>> 6efd9be235 (update media resource links to point to new locations (#20415))
## TiDB Cloud Branching app behaviors
diff --git a/tidb-cloud/migrate-from-mysql-using-data-migration.md b/tidb-cloud/migrate-from-mysql-using-data-migration.md
index f2c1496e61e16..dfb093e66a374 100644
--- a/tidb-cloud/migrate-from-mysql-using-data-migration.md
+++ b/tidb-cloud/migrate-from-mysql-using-data-migration.md
@@ -209,15 +209,15 @@ For detailed instructions about incremental data migration, see [Migrate Only In
- If you click **All**, the migration job will migrate the existing data from the whole source database instance to TiDB Cloud and migrate ongoing changes after the full migration. Note that it happens only if you have selected the **Existing data migration** and **Incremental data migration** checkboxes in the previous step.
-
+
- If you click **Customize** and select some databases, the migration job will migrate the existing data and migrate ongoing changes of the selected databases to TiDB Cloud. Note that it happens only if you have selected the **Existing data migration** and **Incremental data migration** checkboxes in the previous step.
-
+
- If you click **Customize** and select some tables under a dataset name, the migration job only will migrate the existing data and migrate ongoing changes of the selected tables. Tables created afterwards in the same database will not be migrated.
-
+