diff --git a/debian/changelog b/debian/changelog
index ab4a95bc..f805e407 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ llvm-toolchain-17 (1:17.0.5-2) UNRELEASED; urgency=medium
 
 llvm-toolchain-17 (1:17.0.5-1) unstable; urgency=medium
 
+<<<<<<<
   [ John Paul Adrian Glaubitz ]
   * Don't run chrpath for libclang on sparc and sparc64
 
@@ -24,6 +25,16 @@ llvm-toolchain-17 (1:17.0.5-1) unstable; urgency=medium
 
   [ Sylvestre Ledru ]
   * New upstream release
+=======
+  [ John Paul Adrian Glaubitz ]
+  * Don't run chrpath for libclang on sparc and sparc64
+
+  [ Matthias Klose ]
+  * Build-depend on llvm-spirv-17.
+
+  [ Sylvestre Ledru ]
+  * New supstream release
+>>>>>>>
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 14 Nov 2023 11:27:22 +0100