diff --git a/meta/definitions/http.php b/meta/definitions/http.php
index 8a2fa71..07783ea 100644
--- a/meta/definitions/http.php
+++ b/meta/definitions/http.php
@@ -2,11 +2,6 @@
 
 use Lean\ApplicationStrategy\{ ThrowableHandler, ThrowableHandlerInterface, NotFoundDecoratorInterface, NotFoundDecorator, MethodNotAllowedInterface,  };
 use Psr\Container\ContainerInterface;
-<<<<<<< HEAD
-=======
-
-use Lean\ApplicationStrategy\{ ThrowableHandler, ThrowableHandlerInterface, NotFoundDecoratorInterface, NotFoundDecorator, MethodNotAllowedInterface,  };
->>>>>>> ca388e8 (- Merged with master done)
 use Psr\Http\Message\ServerRequestInterface;
 use Laminas\{ Diactoros\ServerRequestFactory, HttpHandlerRunner\Emitter\EmitterInterface, HttpHandlerRunner\Emitter\SapiEmitter };
 use Lean\Factory\{ HttpFactory, HttpFactoryInterface };
@@ -39,13 +34,5 @@ return [
 
     'error.500' => function(ContainerInterface $c, Picea $picea) {
         return $c->get(HttpFactoryInterface::class)::createHtmlResponse($picea->renderHtml("lean/error/500", []), 500);
-<<<<<<< HEAD
     }
-=======
-    },
-
-    ThrowableHandlerInterface::class => autowire(ThrowableHandler::class),
-    NotFoundDecoratorInterface::class => autowire(NotFoundDecorator::class),
-    # MethodNotAllowedInterface::class => autowire(MethodNotAllowedDecorator::class),
->>>>>>> ca388e8 (- Merged with master done)
 ];
diff --git a/src/ApplicationStrategy.php b/src/ApplicationStrategy.php
index eae8c63..2897e70 100644
--- a/src/ApplicationStrategy.php
+++ b/src/ApplicationStrategy.php
@@ -38,9 +38,4 @@ class ApplicationStrategy extends Strategy\ApplicationStrategy {
     {
         return $this->getContainer()->has(MethodNotAllowedInterface::class) ? $this->getContainer()->get(MethodNotAllowedInterface::class) : parent::getMethodNotAllowedDecorator($exception);
     }
-
-    public function getMethodNotAllowedDecorator(MethodNotAllowedException $exception): MiddlewareInterface
-    {
-        return $this->getContainer()->has(MethodNotAllowedInterface::class) ? $this->getContainer()->get(MethodNotAllowedInterface::class) : parent::getMethodNotAllowedDecorator($exception);
-    }
 }
\ No newline at end of file