fixed conflict

README.md

@@ -53,11 +53,16 @@ Several quick start options are available:
 
 - [Download the latest release.](https://github.com/stisla/stisla/archive/v2.2.0.zip)
 - Clone the repo: `git clone https://github.com/stisla/stisla.git`
-- Install with [npm](https://www.npmjs.com)
-- Install with [yarn](https://yarnpkg.com)
+- Install [npm](https://www.npmjs.com) or yarn [yarn](https://yarnpkg.com) first if you don't have it in your machine
+- Run the `stisla-start` command to start using stisla !
 
 Read the [Getting started page](https://getstisla.com/docs) for information on the framework contents, templates and examples, and more.
 
+## Development Guide
+- Clone the repo: `git clone https://github.com/stisla/stisla.git` to your local path
+- Make sure you have [npm](https://www.npmjs.com) or yarn [yarn](https://yarnpkg.com) installed to your machine
+- Run the `stisla-dev` command to install production dependencies
+- Run the `dev` command to start developing
 
 ## Roadmap
 You can find the Stisla road map here: [Stisla Roadmap](https://trello.com/b/M8TMnehE/stisla-roadmap)

package.json

@@ -68,5 +68,8 @@
     "nunjucks": "^3.1.7"
   },
   "scripts": {
+    "stisla-start" : "yarn install --production=false",
+    "stisla-dev" : "yarn install --prod",
+    "dev" : "gulp"
   }
 }