Merge pull request #2170 from TheBlueMatt/2023-04-silent-merge-conflict
[rust-lightning] / pending_changelog / .empty_folder