diff --git a/src/ApplicationStrategy.php b/src/ApplicationStrategy.php
index 3e44bad..37599fc 100644
--- a/src/ApplicationStrategy.php
+++ b/src/ApplicationStrategy.php
@@ -70,5 +70,4 @@ class ApplicationStrategy extends Strategy\ApplicationStrategy {
}
>>>>>>> af8b686 (- WIP on ulmus-user mechanics updates)*/
-
}
\ No newline at end of file
diff --git a/view/lean/picto/undraw_error.phtml b/view/lean/picto/undraw_error.phtml
index 9ab3d82..17d7e58 100644
--- a/view/lean/picto/undraw_error.phtml
+++ b/view/lean/picto/undraw_error.phtml
@@ -1,5 +1,20 @@
<<<<<<< HEAD
+<<<<<<< HEAD
=======
>>>>>>> e2672c4 (- Added createStream methods and fixed multiple errors views)
+=======
+
+=======
+<<<<<<< HEAD
+<<<<<<< HEAD
+
+=======
+
+>>>>>>> fdca37a (- Added createStream methods and fixed multiple errors views)
+=======
+
+>>>>>>> fdca37a (- Added createStream methods and fixed multiple errors views)
+>>>>>>> 16ee065 (- Added createStream methods and fixed multiple errors views)
+>>>>>>> 1c2878a (- Added createStream methods and fixed multiple errors views)