diff --git a/CHANGELOG.md b/CHANGELOG.md
index 27e64b61..59fdd458 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,14 @@
 CHANGELOG
 =========
 
-[Next release](https://github.com/rebing/graphql-laravel/compare/8.4.0...master)
+[Next release](https://github.com/rebing/graphql-laravel/compare/8.5.0...master)
 --------------
 
+2023-01-13, 8.5.0
+-----------------
+### Added
+- Add support for thecodingmachine/safe 2.4 [\#961 / tranvantri](https://github.com/rebing/graphql-laravel/pull/961)
+
 2023-01-06, 8.4.0
 -----------------
 ### Added
diff --git a/composer.json b/composer.json
index 41acd376..6fa2c2d9 100644
--- a/composer.json
+++ b/composer.json
@@ -77,7 +77,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "8.4-dev"
+            "dev-master": "8.5-dev"
         },
         "laravel": {
             "providers": [
diff --git a/src/Support/AliasArguments/ArrayKeyChange.php b/src/Support/AliasArguments/ArrayKeyChange.php
index 6d42156c..c90d1d45 100644
--- a/src/Support/AliasArguments/ArrayKeyChange.php
+++ b/src/Support/AliasArguments/ArrayKeyChange.php
@@ -27,6 +27,7 @@ private function orderPaths(array $paths): array
             return $this->pathLevels($b) <=> $this->pathLevels($a);
         };
 
+        // TODO: can be removed once PHP 7.4 is dropped
         $functionName = Helpers::shouldUseSafe('\\Safe\\uksort');
 
         if (\is_callable($functionName)) {