diff --git a/Changelog.md b/Changelog.md
index 1474b4c..6a73de8 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # 0.3.0
 
 ## Breaking changes
@@ -14,6 +15,10 @@
 * Add faraday 1.x support [#116](https://github.com/diaspora/diaspora_federation/pull/116)
 * Add support for up to ruby 3.1 [#121](https://github.com/diaspora/diaspora_federation/pull/121)
 
+# 0.2.8
+
+* Re-release which allows rails 6 to be used
+
 # 0.2.7
 
 ## Features