diff --git a/fleet-commander-admin.spec b/fleet-commander-admin.spec
index 6c8e5a5..092c824 100644
--- a/fleet-commander-admin.spec
+++ b/fleet-commander-admin.spec
@@ -1,11 +1,6 @@
 Name:           fleet-commander-admin
-<<<<<<< Updated upstream
-Version:        0.10.8
-Release:        6%{?dist}
-=======
 Version:        0.10.9
 Release:        1%{?dist}
->>>>>>> Stashed changes
 Summary:        Fleet Commander
 
 BuildArch: noarch
@@ -166,14 +161,12 @@ install -m 755 -d %{buildroot}/%{_localstatedir}/lib/fleet-commander-admin/profi
 %{_sysconfdir}/udev/rules.d/81-fleet-commander-logger.rules
 
 %changelog
-<<<<<<< Updated upstream
-* Mon Jul 02 2018 Miro Hrončok <mhroncok@redhat.com> - 0.10.8-6
-- Rebuilt for Python 3.7
-=======
 * Thu Jul 12 2018 Oliver Gutierrez <ogutierrez@redhat.com> - 0.10.9-1
 - Fixed errors in Chromium policy file access
 - Fixed unhandled exception accessing non existent virtio device file
->>>>>>> Stashed changes
+
+* Mon Jul 02 2018 Miro Hrončok <mhroncok@redhat.com> - 0.10.8-6
+- Rebuilt for Python 3.7
 
 * Tue Jun 19 2018 Oliver Gutierrez <ogutierrez@redhat.com> - 0.10.8-5
 - Removed Python 3 dependency from admin package