diff --git a/package.json b/package.json
index b0eaa565..0e9dff74 100644
--- a/package.json
+++ b/package.json
@@ -85,11 +85,7 @@
     "react-motion": "^0.5.2",
     "react-redux": "=7.2.4",
     "react-syntax-highlighter": "^15.4.3",
-<<<<<<< HEAD
     "redux": "=4.1.0",
-=======
-    "redux": "=3.7.2",
->>>>>>> chore(deps-dev): update redux-immutable to v4.0.0
     "redux-immutable": "=4.0.0",
     "remarkable": "^2.0.1",
     "reselect": "^4.0.0",