diff --git a/python-glanceclient.spec b/python-glanceclient.spec
index 82a8db4..88a433b 100644
--- a/python-glanceclient.spec
+++ b/python-glanceclient.spec
@@ -155,16 +155,15 @@ install -p -D -m 644 man/glance.1 %{buildroot}%{_mandir}/man1/glance.1
 %license LICENSE
 
 %changelog
-<<<<<<< HEAD
-* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:2.0.0-2
-- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
-=======
 * Mon Jul 25 2016 Haïkel Guémar <hguemar@fedoraproject.org> - 1:2.0.1-2
 - Add python3 subpackage
 
 * Tue Jun 21 2016 Haikel Guemar <hguemar@fedoraproject.org> 1:2.0.1-1
 - Update to 2.0.1
->>>>>>> eda658e... Add python3 subpackage
+
+* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:2.0.0-2
+- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
+
 
 * Wed Mar 23 2016 Haikel Guemar <hguemar@fedoraproject.org> 1:2.0.0-
 - Update to 2.0.0