diff --git a/debian/changelog b/debian/changelog
index b5b6d2ea..e8baf7dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,12 +11,8 @@ llvm-toolchain-11 (1:11.0.1-1) unstable; urgency=medium
 
 llvm-toolchain-11 (1:11.0.1~+rc2-1) unstable; urgency=medium
 
-<<<<<<<
-  * New snapshot release
-=======
   * New snapshot release
   * Remove 'gnu-assembler-compat.diff' - merged upstream
->>>>>>>
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 19 Dec 2020 09:38:48 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index f0951845..c6824d0b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -132,6 +132,7 @@ workaround-bug-42994-use-linker.diff
 
 # bug 939472
 #try-to-unbreak-thinlto.diff
+D67877.patch
 
 x86-fuzzer.patch
 
@@ -140,3 +141,4 @@ print-lldb-path.patch
 libcxx-armhf-ftbfs.diff
 silent-integration-test-suite-i386.diff
 
+D94072.diff