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