diff --git a/stellarium.spec b/stellarium.spec
index 945dd28..36f073c 100644
--- a/stellarium.spec
+++ b/stellarium.spec
@@ -1,8 +1,6 @@
 Name:           stellarium
-<<<<<<< stellarium.spec
 Version:        0.9.1
 Release:        1%{?dist}
-Release:        7%{?dist}
 Summary:        Photo-realistic nightsky renderer
 
 Group:          Amusements/Graphics