diff --git a/api_docs/changelog.md b/api_docs/changelog.md
index 893fd69c52..30b36d8451 100644
--- a/api_docs/changelog.md
+++ b/api_docs/changelog.md
@@ -20,6 +20,20 @@ format used by the Zulip server that they are interacting with.
 
 ## Changes in Zulip 11.0
 
+**Feature level 414**
+
+* [`POST /channel_folders/create`](/api/create-channel-folder),
+  [`GET /channel_folders`](/api/get-channel-folders),
+  [`PATCH /channel_folders/{channel_folder_id}`](/api/update-channel-folder):
+  Added a new field `order` to show in which order should channel folders be
+  displayed. The list is 0-indexed and works similar to the `order` field of
+  custom profile fields.
+* [`PATCH /channel_folders`](/api/patch-channel-folders): Added a new
+  endpoint for reordering channel folders. It accepts an array of channel
+  folder IDs arranged in the order the user desires it to be in.
+* [`GET /channel_folders`](/api/get-channel-folders): Channel folders will
+  be ordered by the `order` field instead of `id` field when being returned.
+
 **Feature level 413**
 
 * Mobile push notification payloads for APNs no longer contain the
diff --git a/api_docs/unmerged.d/ZF-fcae8c.md b/api_docs/unmerged.d/ZF-fcae8c.md
deleted file mode 100644
index 9c05e83293..0000000000
--- a/api_docs/unmerged.d/ZF-fcae8c.md
+++ /dev/null
@@ -1,11 +0,0 @@
-* [`POST /channel_folders/create`](/api/create-channel-folder),
-  [`GET /channel_folders`](/api/get-channel-folders),
-  [`PATCH /channel_folders/{channel_folder_id}`](/api/update-channel-folder):
-  Added a new field `order` to show in which order should channel folders be
-  displayed. The list is 0-indexed and works similar to the `order` field of
-  custom profile fields.
-* [`PATCH /channel_folders`](/api/patch-channel-folders): Added a new
-  endpoint for reordering channel folders. It accepts an array of channel
-  folder IDs arranged in the order the user desires it to be in.
-* [`GET /channel_folders`](/api/get-channel-folders): Channel folders will
-  be ordered by the `order` field instead of `id` field when being returned.
diff --git a/version.py b/version.py
index 6f35e90a34..26cb160a07 100644
--- a/version.py
+++ b/version.py
@@ -34,7 +34,7 @@ DESKTOP_WARNING_VERSION = "5.9.3"
 # new level means in api_docs/changelog.md, as well as "**Changes**"
 # entries in the endpoint's documentation in `zulip.yaml`.
 
-API_FEATURE_LEVEL = 413
+API_FEATURE_LEVEL = 414
 
 # Bump the minor PROVISION_VERSION to indicate that folks should provision
 # only when going from an old version of the code to a newer version. Bump
diff --git a/zerver/openapi/zulip.yaml b/zerver/openapi/zulip.yaml
index 5059345953..41a9dfe8d5 100644
--- a/zerver/openapi/zulip.yaml
+++ b/zerver/openapi/zulip.yaml
@@ -24455,7 +24455,7 @@ paths:
         Fetches all of the channel folders in the organization.
         The folders are sorted by the `order` field.
 
-        **Changes**: Before Zulip 11.0 (feature level ZF-fcae8c),
+        **Changes**: Before Zulip 11.0 (feature level 414),
         these were sorted by ID. (The `order` field didn't exist).
 
         New in Zulip 11.0 (feature level 389).
@@ -24529,7 +24529,7 @@ paths:
         property of all of the channel folders in the organization according to
         the order of the channel folder IDs specified in the request.
 
-        **Changes**: New in Zulip 11.0 (feature level ZF-fcae8c).
+        **Changes**: New in Zulip 11.0 (feature level 414).
       requestBody:
         required: true
         content:
@@ -27619,7 +27619,7 @@ components:
             displayed in the UI. The value is 0 indexed, and the value with
             the lower order will be displayed first.
 
-            **Changes**: New in Zulip 11.0 (feature level ZF-fcae8c).
+            **Changes**: New in Zulip 11.0 (feature level 414).
         id:
           type: integer
           description: |