diff --git a/ghc-cborg.spec b/ghc-cborg.spec
index d0ce112..2a647ca 100644
--- a/ghc-cborg.spec
+++ b/ghc-cborg.spec
@@ -151,13 +151,13 @@ This package provides the Haskell %{pkg_name} profiling library.
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
 * Thu Aug  5 2021 Jens Petersen <petersen@redhat.com> - 0.2.5.0-1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+- update to 0.2.5.0
 
 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.4.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-* Wed Jul 07 2021 Jens Petersen <petersen@redhat.com> - 0.2.5.0-1
-- update to 0.2.5.0
->>>>>>> 667d7d1 (update to 0.2.5.0)
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.4.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.4.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild