diff --git a/libressl.spec b/libressl.spec
index db1e722..bbc3a62 100644
--- a/libressl.spec
+++ b/libressl.spec
@@ -76,11 +76,7 @@
 Summary:		LibreSSL utils and libs coexisting with OpenSSL
 Name:			libressl
 Version:		3.2.0
-<<<<<<< HEAD
-Release:		4
-=======
 Release:		8
->>>>>>> eefcab4b5314a0da4734f85dda5c100fc98fbcbd
 # The code is distributed under ISC license except of original OpenSSL code
 License:		ISC and BSD-like
 Group:			System/Base