diff --git a/kxstitch.spec b/kxstitch.spec
index 608574f..a73149b 100644
--- a/kxstitch.spec
+++ b/kxstitch.spec
@@ -1,12 +1,7 @@
 Name: kxstitch
 Summary: Program to create cross stitch patterns
-<<<<<<< HEAD
 Version: 1.2.0
-Release: 1%{?dist}
-=======
-Version: 0.8.4.1
-Release: 21%{?dist}
->>>>>>> master
+Release: 2%{?dist}
 License: GPLv2+
 Group: Amusements/Graphics
 URL: http://kxstitch.sourceforge.net
@@ -43,29 +38,27 @@ make %{?_smp_mflags} -C %{_target_platform}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 %find_lang %{name} --with-kde || touch %{name}.lang
 
-<<<<<<< HEAD
 %check
 for i in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
   desktop-file-validate "$i"
 done
-=======
+
 %find_lang %{name} --with-kde
 
 ## unpackaged files
 # no one uses locolor icons anymore, don't bother to package
-rm -rf %{buildroot}%{_datadir}/share/icons/locolor/
->>>>>>> master
+rm -rf %{buildroot}%{_kde4_datadir}/share/icons/locolor/
 
 %post
 update-desktop-database &> /dev/null || :
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null || :
 touch --no-create %{_datadir}/mime/packages &> /dev/null || :
 
 %postun
 update-desktop-database &> /dev/null || :
 if [ $1 -eq 0 ] ; then
-    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
-    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+    touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null
+    gtk-update-icon-cache %{_kde4_iconsdir}/icons/hicolor &>/dev/null || :
     touch --no-create %{_datadir}/mime/packages &> /dev/null || :
     update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 fi
@@ -75,32 +68,24 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
 %files -f %{name}.lang
-<<<<<<< HEAD
 
 %{_kde4_bindir}/%{name}
 %{_kde4_datadir}/applications/kde4/%{name}.desktop
 %{_datadir}/mime/packages/%{name}.xml
 %{_kde4_iconsdir}/hicolor/32x32/apps/*
-%{_kde4_iconsdir}/locolor/16x16/apps/*
-%{_kde4_iconsdir}/locolor/32x32/apps/*
 %dir %{_kde4_appsdir}/%{name}
 %{_kde4_appsdir}/%{name}/*
 %{_kde4_sharedir}/config.kcfg/%{name}.kcfg
 %{_mandir}/man1/%{name}.1*
 #doc COPYING ## contaced developer, will be added soon.
 
-=======
-%defattr(-,root,root,-)
-%{_bindir}/%{name}
-%{_datadir}/applications/%{name}.desktop
-%{_datadir}/mime/packages/%{name}.xml
-%{_datadir}/apps/%{name}/
-%{_datadir}/config.kcfg/*
-%{_datadir}/icons/hicolor/*/*/*
-%{_mandir}/man1/%{name}.1*
-%doc AUTHORS ChangeLog COPYING README TODO
-
 %changelog
+* Wed Dec 03 2014 Golo Fuchert <packages@golotop.de> - 1.2.0-2
+- removed differences between f21 and rawhide version of the spec file
+
+* Mon Dec 01 2014 Golo Fuchert <packages@golotop.de> - 1.2.0-1
+- Update to kde4 version
+
 * Thu Oct 02 2014 Rex Dieter <rdieter@fedoraproject.org> - 0.8.4.1-21
 - update mime scriptlet
 - fix icon scriptlets
@@ -112,11 +97,6 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.4.1-19
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
->>>>>>> master
-
-%changelog
-* Mon Dec 01 2014 Golo Fuchert <packages@golotop.de> - 1.2.0-1
-- Update to kde4 version
 
 * Sun Oct 27 2013 Golo Fuchert <packages@golotop.de> - 0.8.4.1-17
 - Rebuilt for new ImageMagick