Index: README.md
===================================================================
--- README.md	(revision c2e9bd946c4c249836b8699c48946f6079ee7a84)
+++ README.md	(revision 1701ba0dc407d6178a3acef51d65ba693e4d4b93)
@@ -6,5 +6,9 @@
 2. ``` cd SaveSpace ```
 3. ``` git checkout -b develop ```
+<<<<<<< HEAD
+4. 
+=======
 4.
+>>>>>>> c2e9bd946c4c249836b8699c48946f6079ee7a84
 5. ``` composer install ```
 6. ``` npm install ```