diff --git a/distros/debian8/patches/series b/distros/debian8/patches/series
index 236833b1e..50378e9c2 100644
--- a/distros/debian8/patches/series
+++ b/distros/debian8/patches/series
@@ -1,5 +1 @@
-<<<<<<< HEAD
-01_vendor-perl.diff
 02_service-file-name.diff
-=======
->>>>>>> ac80649e26d0197bf15dc06e505ecc86bd0aae68