diff --git a/libreoffice.spec b/libreoffice.spec
index 6d7c8b6..668ea8f 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -912,13 +912,6 @@ Provides additional %{langname} translations and resources for %{project}. \
 %patch3
 %patch4 -p1
 %patch5 -p1
-<<<<<<< ./libreoffice.spec.mine
-=======
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
->>>>>>> ./libreoffice.spec.r39e201c4a7e11cf1b55d4dcd6e9ae3d2
 %patch990 -p1
 
 # Disable some of the failing tests (some are random)