diff --git a/qpdfview.spec b/qpdfview.spec
index 516e5cb..181b598 100644
--- a/qpdfview.spec
+++ b/qpdfview.spec
@@ -1,11 +1,6 @@
 Name:		qpdfview
-<<<<<<< HEAD
-Version:	0.4.10
-Release:	3%{?dist}
-=======
 Version:	0.4.12
 Release:	1%{?dist}
->>>>>>> master
 License:	GPLv2+
 Summary:	Tabbed PDF Viewer
 Url:		https://launchpad.net/qpdfview
@@ -64,11 +59,6 @@ rm -f %{buildroot}/%{_datadir}/%{name}/%{name}_ast.qm
 %{_mandir}/man?/*
 
 %changelog
-<<<<<<< HEAD
-* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.10-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-=======
 * Mon Oct 06 2014 TI_Eugene <ti.eugene@gmail.com> 0.4.12-1
 - Version bump
 
@@ -78,7 +68,6 @@ rm -f %{buildroot}/%{_datadir}/%{name}/%{name}_ast.qm
 * Mon Jul 21 2014 TI_Eugene <ti.eugene@gmail.com> 0.4.11-1
 - Version bump
 
->>>>>>> master
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild