BACKPORT-CONFLICT

Author: yyforyongyu

docs/release-notes/release-notes-0.21.0.md

@@ -103,6 +103,7 @@
   to use independent probe payment hashes when probing multiple LSPs, preventing
   later probes from reusing the first probe's CLTV delta.
 
+<<<<<<< HEAD
 * [Restored insta-dispatch of `CLOSED_CHANNEL` on the first confirmation of a
   cooperative close](https://github.com/lightningnetwork/lnd/pull/10794).
   After the multi-conf reorg-aware close dispatch landed,
@@ -113,6 +114,8 @@
   channel arbitrator suppresses the duplicate event that would otherwise be
   emitted from `MarkChannelClosed` at the final confirmation depth.
 
+=======
+>>>>>>> 8eab1edd6 (docs: add EstimateRouteFee release note)
 # New Features
 
 - [Basic Support](https://github.com/lightningnetwork/lnd/pull/9868) for onion