From 28c626597121b0c4fd0341598fde82fdfbaf49d3 Mon Sep 17 00:00:00 2001
From: Aolin <aolin.zhang@pingcap.com>
Date: Wed, 8 Nov 2023 10:27:32 +0800
Subject: [PATCH] resolve conflicts

Signed-off-by: Aolin <aolin.zhang@pingcap.com>
---
 tidb-roadmap.md | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/tidb-roadmap.md b/tidb-roadmap.md
index 45e27bdf0f1d1..0b7abfdc6ae26 100644
--- a/tidb-roadmap.md
+++ b/tidb-roadmap.md
@@ -29,7 +29,7 @@ In the course of development, this roadmap is subject to change based on user ne
         <ul>
           <li>
             <b>Distributed execution framework</b><br /><i>
-            Distributed execution framework v7.2 introduced the foundation for executing background tasks (i.e., DDL, analyze, etc.) parallelized across compute nodes.  v7.4 introduces global sorting in distributed re-organization tasks (i.e., DDL, import) removes a ton of extra resource consumption in storage. Optionally, external shared storage can be leveraged for simplicity and cost savings.</i>
+            In v7.2.0, TiDB introduced the distributed execution framework for background tasks (such as DDL and analyze). This is the foundation for parallelizing these tasks across compute nodes. v7.4.0 introduces global sorting in distributed re-organization tasks (such as DDL and import), which greatly mitigates extra resource consumption in storage. Optionally, external shared storage can be leveraged for simplicity and cost savings.</i>
           </li>
           <br />
           <br />
@@ -57,7 +57,7 @@ In the course of development, this roadmap is subject to change based on user ne
           <br />
           <li>
             <b>Federated query</b>
-            <i>TiDB query planner support for multiple storage engines in HTAP use cases.</i>
+            <br /><i>TiDB query planner support for multiple storage engines in HTAP use cases.</i>
           </li>
           <br />
         </ul>
@@ -76,8 +76,7 @@ In the course of development, this roadmap is subject to change based on user ne
               Control over how background tasks, such as imports, DDL, TTL, auto-analyze, and compactions, can affect foreground traffic
             </i>
           </li>
-          <br>
-          </br>
+          <br />
           <li>
             <b>Runaway query control</b><br /><i>
               An operator-controlled way to greatly enhance performance stability for workloads with unexpectedly expensive queries
@@ -100,8 +99,7 @@ In the course of development, this roadmap is subject to change based on user ne
             <b>Multi-tenancy</b>
             <br /><i>Resource isolation on top of resource control</i>
           </li>
-          <br>
-          </br>
+          <br />
         </ul>
       </td>
     </tr>