diff --git a/debian/patches/series b/debian/patches/series
index 1a956748..ea5d7b9c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -128,7 +128,6 @@ bootstrap-fix-include-next.diff
 # riscv64
 clang-riscv64-multiarch.diff
 
-<<<<<<< HEAD
 # Compiler-rt - workaround
 workaround-bug-42994-use-linker.diff