From f2a483a76af0a81e1c00d5564e5d058b9ea175cd Mon Sep 17 00:00:00 2001
From: Fredrik Oseberg <fredrik.no@gmail.com>
Date: Fri, 23 Apr 2021 15:23:33 +0200
Subject: [PATCH] chore: update changelog

---
 frontend/CHANGELOG.md | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/frontend/CHANGELOG.md b/frontend/CHANGELOG.md
index 5bb8ff9823..2334788a66 100644
--- a/frontend/CHANGELOG.md
+++ b/frontend/CHANGELOG.md
@@ -8,22 +8,19 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 The latest version of this document is always available in
 [releases][releases-url].
 
+# 4.0.0-alpha.9
+- fix: optimizations
+- feat: user profile
 # 4.0.0-alpha.8
 - chore(deps): bump ssri from 6.0.1 to 6.0.2 (#270)
 - fix: lint
 - fix: minor tuning on auth
 - feat: add new user (#273)
-
 # 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