fix: merge conflicts

codeigniter4#7543

Author: kenjis

system/Router/AutoRouterImproved.php

@@ -254,9 +254,9 @@ public function getRoute(string $uri, string $httpVerb): array
                     'Cannot access the default method "' . $this->method . '" with the method name URI path.'
                 );
             }
-        } elseif (method_exists($this->controller, $this->defaultMethod)) {
+        } elseif (method_exists($this->controller, $defaultMethod)) {
             // The default method is found.
-            $this->method = $this->defaultMethod;
+            $this->method = $defaultMethod;
         } else {
             // No method is found.
             throw PageNotFoundException::forControllerNotFound($this->controller, $method);