diff --git a/docs/release-notes/release-notes-0.18.1.md b/docs/release-notes/release-notes-0.18.1.md
index 4e48f639dff..68ffcca1506 100644
--- a/docs/release-notes/release-notes-0.18.1.md
+++ b/docs/release-notes/release-notes-0.18.1.md
@@ -38,7 +38,10 @@
 
 # Technical and Architectural Updates
 ## BOLT Spec Updates
+<<<<<<< HEAD
 
+=======
+>>>>>>> 8c831e59c (docs: add release-notes for LND 0.18.1.)
 ## Testing
 ## Database
 ## Code Health
@@ -46,4 +49,8 @@
 
 # Contributors (Alphabetical Order)
 
+<<<<<<< HEAD
 * Yyforyongyu
+=======
+* ziggie1984
+>>>>>>> 8c831e59c (docs: add release-notes for LND 0.18.1.)
diff --git a/docs/release-notes/release-notes-0.18.3.md b/docs/release-notes/release-notes-0.18.3.md
index 92459039543..4a3f79bae10 100644
--- a/docs/release-notes/release-notes-0.18.3.md
+++ b/docs/release-notes/release-notes-0.18.3.md
@@ -29,6 +29,10 @@
 * [Fixed a bug](https://github.com/lightningnetwork/lnd/pull/8822) that caused
   LND to read the config only partially and continued with the startup.
 
+* [Fixed](https://github.com/lightningnetwork/lnd/pull/8497) a case where LND
+  would not shutdown properly when interrupted via e.g. SIGTERM. Moreover LND
+  now shutsdown correctly in case one subsystem fails to startup.
+
 # New Features
 ## Functional Enhancements
 ## RPC Additions