diff --git a/torque-munge-size.patch b/torque-munge-size.patch
index 18822aa..a473f4d 100644
--- a/torque-munge-size.patch
+++ b/torque-munge-size.patch
@@ -1,9 +1,3 @@
-<<<<<<< HEAD
-diff -uNr torque-3.0.1.ORIG/src/include/libpbs.h torque-3.0.1/src/include/libpbs.h
---- torque-3.0.1.ORIG/src/include/libpbs.h	2011-06-17 19:19:32.984380003 +0200
-+++ torque-3.0.1/src/include/libpbs.h	2011-06-17 19:23:19.406379620 +0200
-@@ -117,7 +117,7 @@
-=======
 From 12a8d7dde1d07aed670f0dd50b317b256daaa991 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Ha=C3=AFkel=20Gu=C3=A9mar?= <hguemar@fedoraproject.org>
 Date: Sun, 12 Jan 2014 11:42:32 +0100