diff --git a/389-ds-base.spec b/389-ds-base.spec
index ba92fd5..573c0ba 100644
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@ -21,11 +21,7 @@
 
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
-<<<<<<< HEAD
-Version:          1.2.11.10
-=======
 Version:          1.2.11.11
->>>>>>> master
 Release:          %{?relprefix}1%{?prerel}%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/