diff --git a/freerdp.spec b/freerdp.spec
index 4cd9543..f368ba2 100644
--- a/freerdp.spec
+++ b/freerdp.spec
@@ -1,10 +1,6 @@
 Name:           freerdp
 Version:        1.0.1
-<<<<<<< HEAD
-Release:        3%{?dist}
-=======
 Release:        7%{?dist}
->>>>>>> el6
 Summary:        Remote Desktop Protocol client
 
 Group:          Applications/Communications