diff --git a/frontend/CHANGELOG.md b/frontend/CHANGELOG.md
index 29a55824cf..5bb8ff9823 100644
--- a/frontend/CHANGELOG.md
+++ b/frontend/CHANGELOG.md
@@ -17,9 +17,13 @@ The latest version of this document is always available in
 # 4.0.0-alpha.7
 - feat: add support for demo sign-in
 # 4.0.0-alpha.5
+<<<<<<< HEAD
 - fix: require ADMIN role to manage users
 - fix: add permissions for tag-types and project
 
+=======
+- feat: frontend should understand rbac permissions
+>>>>>>> chore: update changelog
 # 4.0.0-alpha.4
 - fix: overall bugs
 - feat: user flow