diff --git a/package.json b/package.json
index 52487ba..f931202 100644
--- a/package.json
+++ b/package.json
@@ -23,9 +23,7 @@
   "author": "GitHub",
   "license": "MIT",
   "dependencies": {
-<<<<<<< HEAD
     "@actions/cache": "^1.0.7",
-=======
     "@actions/cache": "^1.0.10",
 >>>>>>> parent of b13b69d (Took toolkit changes.)
     "@actions/core": "^1.2.6",