fix conflict

Author: 7rulnik

package.json

@@ -27,12 +27,6 @@
   },
   "devDependencies": {
     "ava": "^0.13.0",
-<<<<<<< HEAD
-    "coveralls": "^2.11.6",
-    "eslint": "^2.1.0",
-    "eslint-config-xo": "^0.12.0",
-    "nyc": "^6.0.0"
-=======
     "babel-cli": "^6.6.5",
     "babel-eslint": "^5.0.0",
     "babel-plugin-add-module-exports": "^0.1.2",
@@ -48,7 +42,6 @@
     "npm-run-all": "^1.5.1",
     "nyc": "^6.0.0",
     "rimraf": "^2.5.2"
->>>>>>> rewrite to es6 and add check for exsist prop
   },
   "scripts": {
     "watch": "npm run transpile -- --watch",