diff --git a/package-lock.json b/package-lock.json
index dcd7fdc..2a94961 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4338,7 +4338,6 @@
         "pinkie": "2.0.4"
       }
     },
-<<<<<<< HEAD
     "pkg-conf": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/pkg-conf/-/pkg-conf-2.0.0.tgz",
@@ -4426,8 +4425,6 @@
       "integrity": "sha1-0aIUg/0iu0HlihL6NCGCMUCJfEU=",
       "dev": true
     },
-=======
->>>>>>> 72141a31873b674ed23daf262ce14be38dda50ff
     "postcss": {
       "version": "5.2.17",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
@@ -5352,7 +5349,6 @@
       "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
       "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE="
     },
-<<<<<<< HEAD
     "require-uncached": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
@@ -5371,8 +5367,6 @@
         }
       }
     },
-=======
->>>>>>> 72141a31873b674ed23daf262ce14be38dda50ff
     "require_optional": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.1.tgz",
@@ -5382,7 +5376,6 @@
         "semver": "5.3.0"
       }
     },
-<<<<<<< HEAD
     "resolve": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz",
@@ -5392,8 +5385,6 @@
         "path-parse": "1.0.5"
       }
     },
-=======
->>>>>>> 72141a31873b674ed23daf262ce14be38dda50ff
     "resolve-from": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz",