diff --git a/package.json b/package.json
index b196e03..45fcd61 100644
--- a/package.json
+++ b/package.json
@@ -34,13 +34,9 @@
     "issues": "git-issues",
     "license": "license-checker --production --onlyunknown --csv",
     "size": "t=\"$(npm pack .)\"; wc -c \"${t}\"; tar tvf \"${t}\"; rm \"${t}\";",
-<<<<<<< HEAD
     "test": "npm run unit",
     "unit": "mocha src/*-spec.js",
     "unused-deps": "dependency-check --unused --no-dev . --entry src/index.js",
-=======
-    "unused-deps": "dependency-check --unused --no-dev . --entry src/add-initial-snapshot-file.js",
->>>>>>> cce9ee3 (remove eslint and add cypress:update command)
     "semantic-release": "semantic-release",
     "cypress:open": "cypress open",
     "cypress:update": "cypress run --env SNAPSHOT_UPDATE=true",