diff --git a/debian/changelog b/debian/changelog
index 7e053103..2925ea69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,9 @@
 llvm-toolchain-snapshot (1:18~++20230921012857+4cf8da94198d-1~exp1) UNRELEASED; urgency=medium
 
-<<<<<<<
   [ Sylvestre Ledru ]
   * replace python3-recommonmark by myst-parser
     to follow upstream change b7ff03206d668cd5a620a9d4e1b22ea112ed56e3
     And disable generation of the doc on old distro
-  * Also install readtapi => llvm-readtapi symlink
   * Ship tblgen-to-irdl as part of mlir-tools
 
   [ Matthias Klose ]
@@ -17,12 +15,6 @@ llvm-toolchain-snapshot (1:18~++20230921012857+4cf8da94198d-1~exp1) UNRELEASED;
   * Use a stamps subdirectory for all build stamps.
   * Factor-out the calls to dh_listpackages.
   * d/rules/preconfigure: Print info about build environment.
-=======
-  * replace python3-recommonmark by myst-parser
-    to follow upstream change b7ff03206d668cd5a620a9d4e1b22ea112ed56e3
-    And disable generation of the doc on old distro
-  * Also install readtapi => llvm-readtapi symlink
->>>>>>>
 
  -- Matthias Klose <doko@debian.org>  Sun, 08 Oct 2023 08:10:51 +0200