diff --git a/nsd.spec b/nsd.spec
index 89248dd..589343d 100644
--- a/nsd.spec
+++ b/nsd.spec
@@ -1,12 +1,7 @@
 Summary: fast and lean authoritative DNS name server
 Name: nsd
-<<<<<<< nsd.spec
 Version: 3.2.1
 Release: 1%{?dist}
-=======
-Version: 3.2.0
-Release: 4%{?dist}
->>>>>>> 1.43
 License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
 #Source: http://www.nlnetlabs.nl/downloads/%{name}/%{name}-%{version}.tar.gz