diff --git a/meta/definitions/http.php b/meta/definitions/http.php
index 9cdfe04..cbfab68 100644
--- a/meta/definitions/http.php
+++ b/meta/definitions/http.php
@@ -11,7 +11,7 @@ use Storage\Cookie,
     Storage\Session,
     Storage\SessionMiddleware;
 
-use function DI\autowire, DI\create, DI\get;
+use function DI\{ autowire, create, get };
 
 return [
     ServerRequestInterface::class => function ($c) {
diff --git a/src/ApplicationStrategy.php b/src/ApplicationStrategy.php
index d5b833d..0539eed 100644
--- a/src/ApplicationStrategy.php
+++ b/src/ApplicationStrategy.php
@@ -39,6 +39,7 @@ class ApplicationStrategy extends Strategy\ApplicationStrategy {
         return $this->getContainer()->has(MethodNotAllowedInterface::class) ? $this->getContainer()->get(MethodNotAllowedInterface::class) : parent::getMethodNotAllowedDecorator($exception);
     }
 
+<<<<<<< HEAD
 /*<<<<<<< HEAD
         /*=======
     public function getMethodNotAllowedDecorator(MethodNotAllowedException $exception): MiddlewareInterface
@@ -71,4 +72,10 @@ class ApplicationStrategy extends Strategy\ApplicationStrategy {
     }
 
 >>>>>>> af8b686 (- WIP on ulmus-user mechanics updates)*/
+=======
+    public function getMethodNotAllowedDecorator(MethodNotAllowedException $exception): MiddlewareInterface
+    {
+        return $this->getContainer()->has(MethodNotAllowedInterface::class) ? $this->getContainer()->get(MethodNotAllowedInterface::class) : parent::getMethodNotAllowedDecorator($exception);
+    }
+>>>>>>> c6e9bb6 (- Added MethodNotAllowed interface)
 }
\ No newline at end of file