diff --git a/purple-telegram.spec b/purple-telegram.spec
index 7c8d1fc..9c32561 100644
--- a/purple-telegram.spec
+++ b/purple-telegram.spec
@@ -50,13 +50,11 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/telegram-
 %{_datadir}/appdata/telegram-purple.metainfo.xml
 
 %changelog
-<<<<<<< HEAD
 * Tue Sep 03 2019 Jiri Eischmann <eischmann@redhat.com> - 1.4.2-1
 - Update to 1.4.2
-=======
+
 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
->>>>>>> 03a77fdcd672a743e36e53b04265dae3d660ec4e
 
 * Mon Mar 11 2019 Jiri Eischmann <eischmann@redhat.com> - 1.4.1-1
 - Update to 1.4.1