diff --git a/fuse.spec b/fuse.spec
index 937fe8c..d881b84 100644
--- a/fuse.spec
+++ b/fuse.spec
@@ -1,8 +1,6 @@
-%global fuse2sver 2
-
 Name:		fuse
 Version:	2.9.9
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	File System in Userspace (FUSE) v2 utilities
 License:	GPL+
 URL:		http://fuse.sf.net
@@ -125,9 +123,13 @@ rm -f %{buildroot}/%{_libdir}/*.a
 %{_includedir}/fuse
 
 %changelog
-* Mon Apr 06 2019 Dave Dykstra <dwd@fedoraproject.org> - 2.9.9-3
+<<<<<<< HEAD
+* Mon May 01 2019 Dave Dykstra <dwd@fedoraproject.org> - 2.9.9-4
 - Separate fuse3 out into its own package
 
+* Tue Apr 16 2019 Adam Williamson <awilliam@redhat.com> - 2.9.9-3
+- Rebuild with Meson fix for #1699099
+
 * Thu Apr 04 2019 Peter Lemenkov <lemenkov@gmail.com> - 2.9.9-2
 - Whitelist SMB2 (rhbz#1694552)