Updated changelog to resolve conflict

Author: rxjacob

CHANGES.md

@@ -13,6 +13,14 @@
 
 <!-- Changes that affect Black's stable style -->
 
+- Fix bug where comments preceding `# fmt: off`/`# fmt: on` blocks were incorrectly
+  removed, particularly affecting Jupytext's `# %% [markdown]` comments (#4845)
+- Fix crash when multiple `# fmt: skip` comments are used in a multi-part if-clause, on
+  string literals, or on dictionary entries with long lines (#4872)
+- Fix possible crash when `fmt: ` directives aren't on the top level (#4856)
+- Fix bug where `if` guards in `case` blocks were incorrectly split when the pattern had 
+  a trailing comma (#4884)
+
 ### Preview style
 
 <!-- Changes that affect Black's preview style -->