From 85a124c1f4faf26f3f1dc533d206f8d0a1c24cbe Mon Sep 17 00:00:00 2001
From: Alec Pritchard <ajmedway@gmail.com>
Date: Wed, 9 Mar 2022 10:42:47 +0000
Subject: [PATCH] Update CHANGELOG.md

---
 CHANGELOG.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 90d84b1..3c5eb1d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,11 +9,9 @@
  - Enh #387: Added Persian translation (hadi-aj)
  - Fix #384: Delete flash messages after consuming (cgsmith)
  - Enh: Added SK translations (snickom)
-<<<<<<< Updated upstream
  - Fix: allow password_changed_at to be saved when reseting password (p4blojf)
  - Fix #430: Moved EVENT_BEFORE_PROFILE_UPDATE to correct place (eluhr)
-=======
->>>>>>> Stashed changes
+ - Fix #391: Always create flash messages, allow `enableFlashMessages` only to dictate display (ajmedway)
 
 ## 1.5.1 April 5, 2020
  - Fix #370: Extending view fix (effsoft)