diff --git a/orangefs.spec b/orangefs.spec
index 63cf134..a217510 100644
--- a/orangefs.spec
+++ b/orangefs.spec
@@ -1,6 +1,11 @@
 Name: orangefs
+<<<<<<< HEAD
 Version: 2.9.8
 Release: 1%{?dist}
+=======
+Version: 2.9.7
+Release: 9%{?dist}
+>>>>>>> b9ef29d53ba2fd1d2e5395bf2166978d454d5d18
 Summary: Parallel network file system client
 URL: https://www.orangefs.org/
 # BSD (2 clause) maint/config/ssl.m4
@@ -291,6 +296,9 @@ This package contains the FUSE client.
 * Thu Sep 17 2020 David Schwörer <davidsch@fedoraproject.org> - 2.9.8-1
 - update to new upstream release
 
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.7-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Wed Apr 15 2020 David Schwörer <davidsch@fedoraproject.org> - 2.9.7-8
 - enable -fcommon to work around build failure