diff --git a/CHANGELOG.md b/CHANGELOG.md
index 921302f30..d857e3863 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,8 +9,18 @@ This changelog is viewable on the web at https://docs.funkwhale.audio/changelog.
 
 <!-- towncrier -->
 
+<<<<<<< HEAD
+
 ## 2.0.0-alpha.2 (2025-06-10)
 
+=======
+
+## 2.0.0-alpha.2 (2025-06-06)
+
+Carefully read [this blog post](https://blog.funkwhale.audio/2025-funkwhale-2-news.html) before upgrading. This alpha release might break your db.
+
+> > > > > > > e650d19c3 (chore: add changelog entry; replace var with ref (linter))
+
 Upgrade instructions are available at https://docs.funkwhale.audio/administrator/upgrade/index.html
 
 Enhancements:
@@ -22,6 +32,14 @@ Bugfixes:
 
 - Fixed database migrations for trackfavorite, playlist and playlisttrack
 
+# <<<<<<< HEAD
+
+Other:
+
+- Fixed regressions in Tags selector after removal of jQuery (#2440, #2390)
+
+> > > > > > > e650d19c3 (chore: add changelog entry; replace var with ref (linter))
+
 ## 2.0.0-alpha.1 (2025-05-23)
 
 Carefully read [this blog post](https://blog.funkwhale.audio/2025-funkwhale-2-news.html) before upgrading. This alpha release might break your db.