Resolve release note conflicts

Author: michaelklishin

release-notes/3.8.25.md

@@ -54,15 +54,6 @@ consistent release schedule.
 
    GitHub issue: [#2653](https://github.com/rabbitmq/rabbitmq-server/pull/2653)
 
-### OAuth 2 Plugin
-
-#### Bug Fixes
-
- * Signing keys specified in `rabbitmq.conf` were not translated correctly,
-   resulting in exceptions during permission checks.
-
-   GitHub issue: [#3759](https://github.com/rabbitmq/rabbitmq-server/pull/3759)
-
 
 ## Dependency Upgrades
 

release-notes/3.8.26.md

@@ -41,6 +41,16 @@ Contributors are encouraged to update them together with their changes.  This he
 consistent release schedule.
 
 
+### OAuth 2 Plugin
+
+#### Bug Fixes
+
+ * Signing keys specified in `rabbitmq.conf` were not translated correctly,
+   resulting in exceptions during permission checks.
+
+   GitHub issue: [#3759](https://github.com/rabbitmq/rabbitmq-server/pull/3759)
+
+
 ## Dependency Upgrades
 
  None in this release.