diff --git a/releases/release-timeline.md b/releases/release-timeline.md
index 8126ad03cf30..b0cc8c860c6d 100644
--- a/releases/release-timeline.md
+++ b/releases/release-timeline.md
@@ -11,12 +11,7 @@ summary: 了解 TiDB 的版本发布时间线。
 
 | 版本 | 发布日期 |
 | :--- | :--- |
-<<<<<<< HEAD
-=======
 | [7.1.6](/releases/release-7.1.6.md) | 2024-11-21 |
-| [8.4.0-DMR](/releases/release-8.4.0.md) | 2024-11-11 |
-| [7.5.4](/releases/release-7.5.4.md) | 2024-10-15 |
->>>>>>> 6d7cbc08a4 (release notes 7.1.6 (#19056))
 | [6.5.11](/releases/release-6.5.11.md) | 2024-09-20 |
 | [6.5.10](/releases/release-6.5.10.md) | 2024-06-20 |
 | [7.1.5](/releases/release-7.1.5.md) | 2024-04-26 |