- Fixed conflicts

src/ApplicationStrategy.php

@@ -33,7 +33,7 @@ class ApplicationStrategy extends Strategy\ApplicationStrategy {
     {
         return $this->getContainer()->get(ThrowableHandlerInterface::class);
     }
-
+    
     public function getMethodNotAllowedDecorator(MethodNotAllowedException $exception): MiddlewareInterface
     {
         return $this->getContainer()->has(MethodNotAllowedInterface::class) ? $this->getContainer()->get(MethodNotAllowedInterface::class) : parent::getMethodNotAllowedDecorator($exception);
@@ -67,6 +67,7 @@ class ApplicationStrategy extends Strategy\ApplicationStrategy {
                 return $this->di->get('error.404');
             }
         };
+<<<<<<< HEAD
     }
 
 >>>>>>> af8b686 (- WIP on ulmus-user mechanics updates)*/