diff --git a/src/ApplicationStrategy.php b/src/ApplicationStrategy.php
index 0b182f4..a25f469 100644
--- a/src/ApplicationStrategy.php
+++ b/src/ApplicationStrategy.php
@@ -66,8 +66,8 @@ class ApplicationStrategy extends Strategy\ApplicationStrategy {
 
                 return $this->di->get('error.404');
             }
-        };
-<<<<<<< HEAD 
+        }; 
+<<<<<<< HEAD
     }
 
 >>>>>>> af8b686 (- WIP on ulmus-user mechanics updates)*/