diff --git a/src/ApplicationStrategy.php b/src/ApplicationStrategy.php
index 308647a..30fb7d3 100644
--- a/src/ApplicationStrategy.php
+++ b/src/ApplicationStrategy.php
@@ -38,6 +38,7 @@ class ApplicationStrategy extends Strategy\ApplicationStrategy {
     {
         return $this->getContainer()->has(MethodNotAllowedInterface::class) ? $this->getContainer()->get(MethodNotAllowedInterface::class) : parent::getMethodNotAllowedDecorator($exception);
     }
+<<<<<<< HEAD
 
 /*<<<<<<< HEAD
         /*=======
@@ -71,4 +72,6 @@ class ApplicationStrategy extends Strategy\ApplicationStrategy {
     }
 
 >>>>>>> af8b686 (- WIP on ulmus-user mechanics updates)*/
+=======
+>>>>>>> 06c4f46 (- Added MethodNotAllowed interface)
 }
\ No newline at end of file