From af05ab81b6162edf3cf8ad0628a5302ed524d359 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ulysse=20G=C3=A9rard?= <thevoodoos@gmail.com>
Date: Wed, 15 Nov 2023 14:05:20 +0100
Subject: [PATCH] Merge changelog entries for #1698 and #1705)

---
 CHANGES.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index cb7142e965..3ff87c4b3a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,9 +2,9 @@ merlin NEXT_VERSION
 ===================
 
   + merlin binary
-    - Rename `-cache-period` flag to `-cache-lifespan`. (#1705)
     - Fix a follow-up issue to the preference of non-ghost nodes introduced in #1660 (#1690, fixes #1689)
-    - Add `--cache-period` flag, that sets cache invalidation period. (#1698)
+    - Add `-cache-lifespan` flag, that sets cache invalidation period. (#1698,
+      #1705)
     - Fix Merlin locate not fallbacking on the correct file in case of ambiguity
       (@goldfirere, #1699)
   + editor modes