diff --git a/debian/changelog b/debian/changelog
index 22a8fd96..ea4bb6f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,5 @@
 llvm-toolchain-9 (1:9.0.1~+rc2-1~exp2) UNRELEASED; urgency=medium
 
-<<<<<<<
   * Use secure URI in debian/watch.
   * Move source package lintian overrides to debian/source.
   * Remove patches force-gcc-header-obj.diff, hurd-pathmax.diff, impl-
@@ -8,20 +7,8 @@ llvm-toolchain-9 (1:9.0.1~+rc2-1~exp2) UNRELEASED; urgency=medium
     fail-extended-long-double.patch, revert-change-soname.diff, try-to-
     unbreak-thinlto.diff that are missing from debian/patches/series.
   * Rely on pre-initialized dpkg-architecture variables.
-  * Bump debhelper from old 9 to 12.
-  * Set debhelper-compat version in Build-Depends.
   * Move transitional package libclang-cpp1-9 to oldlibs/optional per
     policy 4.0.1.
-=======
-  * Use secure URI in debian/watch.
-  * Move source package lintian overrides to debian/source.
-  * Remove patches force-gcc-header-obj.diff, hurd-pathmax.diff, impl-
-    path-hurd.diff, libcxxabi-arm-ehabi-fix.patch, libcxxabi-test-don-t-
-    fail-extended-long-double.patch, revert-change-soname.diff, try-to-
-    unbreak-thinlto.diff that are missing from debian/patches/series.
-  * Rely on pre-initialized dpkg-architecture variables.
-  * Bump debhelper from old 9 to 12.
->>>>>>>
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 08 Dec 2019 21:02:49 +0100