diff --git a/debian/changelog b/debian/changelog
index 70e2bf01..1498f167 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -108,13 +108,8 @@ llvm-toolchain-15 (1:15.0.0-1~exp1) experimental; urgency=medium
 
 llvm-toolchain-15 (1:15.0.0~+rc3-1~exp2) experimental; urgency=medium
 
-<<<<<<<
   * Update of the build dep from llvm-spirv => llvm-spirv-14
     as it is now versionned. It should build libclc
-=======
-  * Update of the build dep from llvm-spirv => llvm-spirv-14
-    as it is now versioned. It should build libclc
->>>>>>>
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 31 Aug 2022 17:10:33 +0200