diff --git a/debian/patches/series b/debian/patches/series
index 5590b18b..4fec2917 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -35,16 +35,11 @@ lldb-link-atomic-cmake.patch
 disable-llvm-symbolizer-test.diff
 kfreebsd-support.diff
 clang-tidy-run-bin.diff
-<<<<<<< .working
 drop-wrong-hack-arm64.patch
 bug-30342.diff
 fix-scan-view-path.diff
 0011-SimplifyCFG-Hoisting-invalidates-metadata.patch
 clang-fix-cmpxchg8-detection-on-i386.patch
 lldb-addversion-suffix-to-llvm-server-exec.patch
-#upstream-fix-asan-initialization.diff
-upstream-msan-prevent-initialization-failure.diff
-upstream-asan-msan-fix-reallocation-logic.diff
-silent-llvm-symbolizer.diff
 upstream-msan-prevent-initialization-failure.diff
 upstream-asan-msan-fix-reallocation-logic.diff
diff --git a/debian/patches/silent-llvm-symbolizer.diff b/debian/patches/silent-llvm-symbolizer.diff
deleted file mode 100644
index 4834dae6..00000000
--- a/debian/patches/silent-llvm-symbolizer.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: llvm-toolchain-3.8-3.8.1/test/tools/llvm-symbolizer/print_context.c
-===================================================================
---- llvm-toolchain-3.8-3.8.1.orig/test/tools/llvm-symbolizer/print_context.c
-+++ llvm-toolchain-3.8-3.8.1/test/tools/llvm-symbolizer/print_context.c
-@@ -1,6 +1,7 @@
- // REQUIRES: x86_64-linux
- // RUN: %host_cc -O0 -g %s -o %t 2>&1
- // RUN: %t 2>&1 | llvm-symbolizer -print-source-context-lines=5 -obj=%t | FileCheck %s --check-prefix=CHECK
-+// XFAIL: *
- 
- #include <stdio.h>
-