From af31f9b95d15816fea9cc2de8a3e378bc015954e Mon Sep 17 00:00:00 2001
From: Grace Cai <qqzczy@126.com>
Date: Tue, 27 Aug 2024 16:10:32 +0800
Subject: [PATCH] Update releases/release-timeline.md

---
 releases/release-timeline.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/releases/release-timeline.md b/releases/release-timeline.md
index a3a74cf75c36c..d45a6e403377c 100644
--- a/releases/release-timeline.md
+++ b/releases/release-timeline.md
@@ -11,11 +11,7 @@ This document shows all the released TiDB versions in reverse chronological orde
 
 | Version | Release Date |
 | :--- | :--- |
-<<<<<<< HEAD
-=======
 | [8.1.1](/releases/release-8.1.1.md) | 2024-08-27 |
-| [8.3.0-DMR](/releases/release-8.3.0.md) | 2024-08-22 |
->>>>>>> 2cb0adce32 (add v8.1.1 release notes (#18537))
 | [7.5.3](/releases/release-7.5.3.md) | 2024-08-05 |
 | [6.5.10](/releases/release-6.5.10.md) | 2024-06-20 |
 | [7.5.2](/releases/release-7.5.2.md) | 2024-06-13 |