diff --git a/fuse.spec b/fuse.spec
index d881b84..fe48949 100644
--- a/fuse.spec
+++ b/fuse.spec
@@ -123,7 +123,6 @@ rm -f %{buildroot}/%{_libdir}/*.a
 %{_includedir}/fuse
 
 %changelog
-<<<<<<< HEAD
 * Mon May 01 2019 Dave Dykstra <dwd@fedoraproject.org> - 2.9.9-4
 - Separate fuse3 out into its own package