diff --git a/changelog.md b/changelog.md
index 946f824b162380523ed3ab90e8cc22fdb53877c3..80f71dd0df0df1e75c53703f104086fc1534d734 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,10 +1,9 @@
-<<<<<<< HEAD
-=======
-
->>>>>>> release/0.1
 # Changelog
 
 All notable changes to this project will be documented in this file.
 
+## [0.2] - 2021-03-03
+- Generate and provision dashboards concurrently to reduce time to provision
+
 ## [0.1] - 2021-02-24
 - initial skeleton