diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca1464b75a..1c8ab0a4af 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,5 @@
 # Changelog
 
-<<<<<<< HEAD
 # 4.0.0-alpha.6
 
 - feat: Teams addon for messaging on Microsoft teams (#814)
@@ -24,11 +23,6 @@
 - fix: migration should call cb on down
 - fix: change default admin password
 - fix: add types for node-fetch
-=======
-# 4.0.0-alpha.5
-
-- chore: update frontend
->>>>>>> chore: update changelog
 
 # 4.0.0-alpha.4