Solve merge conflict

gegl04.spec

@@ -2,7 +2,7 @@
 
 Name:           gegl04
 Version:        0.4.26
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        Graph based image processing framework
 
 # The binary is under the GPL, while the libs are under LGPL.
@@ -166,9 +166,15 @@ chrpath --delete %{buildroot}%{_libdir}/gegl-%{apiver}/*.so
 
 
 %changelog
-* Thu Jan 28 2021 Josef Ridky <jridky@redhat.com> - 0.4.26-2
+* Thu Jan 28 2021 Josef Ridky <jridky@redhat.com> - 0.4.26-4
 - Disable OpenEXR on RHEL
 
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.26-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Fri Jan 01 2021 Richard Shaw <hobbes1069@gmail.com> - 0.4.26-2
+- Rebuild for OpenEXR 2.5.3.
+
 * Mon Aug 24 2020 Josef Ridky <jridky@redhat.com> - 0.4.26-1
 - New upstream release 0.4.26