Fix changelog.

Fix rebase issues.

Author: davidlehn

CHANGELOG.md

@@ -14,6 +14,13 @@
   result in lossy behavior or other data warnings. This is intended to be the
   common way that digital signing and similar applications use this library.
 
+### Removed
+- Experimental non-standard `protectedMode` option.
+- **BREAKING**: Various console warnings were removed. The newly added "safe
+  mode" can stop processing where these warnings occurred.
+- **BREAKING**: Remove `compactionMap` and `expansionMap`. Their known use
+  cases are addressed with "safe mode" and future planned features.
+
 ## 6.0.0 - 2022-06-06
 
 ### Changed
@@ -36,13 +43,6 @@
     and provide other improvements.
   - Use global `URL` interface to handle relative redirects.
 
-### Removed
-- Experimental non-standard `protectedMode` option.
-- **BREAKING**: Various console warnings were removed. The newly added "safe
-  mode" can stop processing where these warnings were.
-- **BREAKING**: Remove `compactionMap` and `expansionMap`. Their known use
-  cases are addressed with "safe mode" and future planned features.
-
 ## 5.2.0 - 2021-04-07
 
 ### Changed