diff --git a/debian/changelog b/debian/changelog
index 7be95a6f..cb430227 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,5 @@
 llvm-toolchain-14 (1:14.0.6-11) UNRELEASED; urgency=medium
 
-<<<<<<<
   [ Sylvestre Ledru ]
   * Update SV to 4.6.2
   * Disable libc++-$(LLVM_VERSION)-dev-wasm32 on old Debian & Ubuntu:
@@ -8,19 +7,10 @@ llvm-toolchain-14 (1:14.0.6-11) UNRELEASED; urgency=medium
     either wasi-libc isn't available or too old or we face bug
     https://sourceware.org/bugzilla/show_bug.cgi?id=27558
   * adjust the lintian override format with the []
-
-  [ Gianfranco Costamagna ]
-  * Fix riscv64 build by adding spirv again (from @paravoid)
-=======
-  [ Sylvestre Ledru ]
-  * Update SV to 4.6.2
-  * Disable libc++-$(LLVM_VERSION)-dev-wasm32 on old Debian & Ubuntu
   * hardcode a bit less sccache usage
 
   [ Gianfranco Costamagna ]
   * Fix riscv64 build by adding spirv again (from @paravoid)
->>>>>>>
-
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 15 Jan 2023 09:40:55 +0100