diff --git a/freerdp.spec b/freerdp.spec
index 98ef9a1..dab9387 100644
--- a/freerdp.spec
+++ b/freerdp.spec
@@ -294,7 +294,6 @@ find %{buildroot} -name "*.a" -delete
 %{_libdir}/pkgconfig/winpr-tools2.pc
 
 %changelog
-<<<<<<< HEAD
 * Thu May 21 2020 Ondrej Holy <oholy@redhat.com> - 2:2.1.1-1
 - Update to 2.1.1.