diff --git a/uid_wrapper.spec b/uid_wrapper.spec
index 79a82b3..584b657 100644
--- a/uid_wrapper.spec
+++ b/uid_wrapper.spec
@@ -1,11 +1,6 @@
 Name:           uid_wrapper
-<<<<<<< HEAD
-Version:        1.2.4
-Release:        5%{?dist}
-=======
 Version:        1.2.7
 Release:        1%{?dist}
->>>>>>> d3e8eb2... Update to version 1.2.7
 
 Summary:        A wrapper for privilege separation
 License:        GPLv3+