content/post/release-of-1.17.0.md

@@ -90,11 +90,6 @@ A repository admin or instance admin can find the delete button at the bottom of
 
 Thanks to [@zeripath](https://github.com/zeripath), wiki pages now show their logical structure automatically in the sidebar. This removes the need to manually maintain a ToC and helps you to skim for the most important sections.
 
-### Customizing the default merge style ([#19751](https://github.com/go-gitea/gitea/pull/19751))
-
-Thanks to [@ttys3](https://github.com/ttys3), Gitea now allows you to set the default merge style globally. This only affects repositories that were created after the setting change.
-<!-- I'd not mention this, too minor of a change. wdyt? -->
-
 ### Customizing the default commit messages ([#18177](https://github.com/go-gitea/gitea/pull/18177))
 
 Thanks to [@lunny](https://github.com/lunny), you can now set the default merge message used for merging PRs.  
@@ -269,6 +264,7 @@ If you want notices on success, you must set `NOTICE_ON_SUCCESS=true`.
   * Added auto-save whitespace behavior if it changed manually ([#15566](https://github.com/go-gitea/gitea/pull/15566))
   * Find files in repo ([#15028](https://github.com/go-gitea/gitea/pull/15028))
   * Provide configuration to allow camo-media proxying ([#12802](https://github.com/go-gitea/gitea/pull/12802))
+  * Allow custom default merge message with `.gitea/default_merge_message/<merge_style>_TEMPLATE.md` ([#18177](https://github.com/go-gitea/gitea/pull/18177))
 * API
   * Add endpoint to serve blob or LFS file content ([#19689](https://github.com/go-gitea/gitea/pull/19689))
   * Add endpoint to check if team has repo access ([#19540](https://github.com/go-gitea/gitea/pull/19540))
@@ -395,7 +391,6 @@ If you want notices on success, you must set `NOTICE_ON_SUCCESS=true`.
   * Limit max-height of CodeMirror editors for issue comment and wiki ([#18271](https://github.com/go-gitea/gitea/pull/18271))
   * Validate migration files ([#18203](https://github.com/go-gitea/gitea/pull/18203))
   * Format with gofumpt ([#18184](https://github.com/go-gitea/gitea/pull/18184))
-  * Allow custom default merge message with `.gitea/default_merge_message/<merge_style>_TEMPLATE.md` ([#18177](https://github.com/go-gitea/gitea/pull/18177))
   * Prettify number of issues ([#17760](https://github.com/go-gitea/gitea/pull/17760))
   * Add a "admin user generate-access-token" subcommand ([#17722](https://github.com/go-gitea/gitea/pull/17722))
   * Custom regexp external issues ([#17624](https://github.com/go-gitea/gitea/pull/17624))