diff --git a/kde-baseapps.spec b/kde-baseapps.spec
index 365ed3c..edc773c 100644
--- a/kde-baseapps.spec
+++ b/kde-baseapps.spec
@@ -1,10 +1,6 @@
 Name:    kde-baseapps
 Summary: KDE Core Applications 
-<<<<<<< HEAD
-Version: 4.9.5
-=======
 Version: 4.10.1
->>>>>>> master
 Release: 1%{?dist}
 
 License: GPLv2
@@ -275,13 +271,6 @@ fi
 
 
 %changelog
-<<<<<<< HEAD
-* Sat Dec 29 2012 Rex Dieter <rdieter@fedoraproject.org> - 4.9.5-1
-- 4.9.5
-
-* Mon Dec 10 2012 Than Ngo <than@redhat.com> - 4.9.4-2
-- apply upstream patch to fix regression in dolphin
-=======
 * Sat Mar 02 2013 Rex Dieter <rdieter@fedoraproject.org> 4.10.1-1
 - 4.10.1
 
@@ -305,7 +294,6 @@ fi
 
 * Mon Dec 03 2012 Rex Dieter <rdieter@fedoraproject.org> 4.9.90-1
 - 4.9.90 (4.10 beta2)
->>>>>>> master
 
 * Mon Dec 03 2012 Than Ngo <than@redhat.com> - 4.9.4-1
 - 4.9.4