diff --git a/cryptlib.spec b/cryptlib.spec
index d11f1a0..0ae182c 100644
--- a/cryptlib.spec
+++ b/cryptlib.spec
@@ -310,7 +310,6 @@ tar xpzf %{SOURCE4}
 
 
 %changelog
-<<<<<<< HEAD
 * Sat Nov 23 2019 Ralf Senderek <innovation@senderek.ie> - 3.4.5-7
 - Enable gcc versions > 9