diff --git a/debian/changelog b/debian/changelog
index f4f8ebae..0e7ab8dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,6 @@
 llvm-toolchain-11 (1:11.0.0~+rc3-1) unstable; urgency=medium
 
-<<<<<<<
-  * New snapshot release
-=======
   * New rc release
->>>>>>>
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 22 Sep 2020 17:19:40 +0200