diff --git a/BackupPC.spec b/BackupPC.spec
index bc68b90..15398a2 100644
--- a/BackupPC.spec
+++ b/BackupPC.spec
@@ -327,12 +327,6 @@ fi
 - unbundle Net::FTP::*
 - add support for tmpfiles.d
 
-* Mon May 17 2010 Johan Cwiklinski <johan AT x-tnd DOT be> 3.1.0-14
-- Fix for bug #592762
-
-* Mon Mar 29 2010 Johan Cwiklinski <johan AT x-tnd DOT be> 3.1.0-13
-- Rebuild agaisnt latest selinux policy (bug #577389)
-
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.0-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
@@ -348,7 +342,6 @@ fi
 * Mon May 17 2010 Johan Cwiklinski <johan AT x-tnd DOT be> 3.1.0-14
 - Fix for bug #592762
 
->>>>>>> master
 * Sun Feb 28 2010 Johan Cwiklinski <johan AT x-tnd DOT be> 3.1.0-12
 - Add "::1" to the apache config file for default allowed adresses
 - Fix a typo in the apache config file