diff --git a/package.json b/package.json
index fabc5e750..ad91b822e 100644
--- a/package.json
+++ b/package.json
@@ -128,8 +128,8 @@
     "husky": "^0.14.3",
     "json-loader": "^0.5.4",
     "lbry-format": "https://github.com/lbryio/lbry-format.git",
-    "lbry-redux": "lbryio/lbry-redux#6bd56492ad15a0e761b087db29a5441e9b9a04f0",
-    "lbryinc": "lbryio/lbryinc#f8bba34b34599a8450ced842b29336d1117d050d",
+    "lbry-redux": "lbryio/lbry-redux#01614094dae83263e213e03319573e34cc922995",
+    "lbryinc": "lbryio/lbryinc#d250096a6fc5df16be4f82812ecce28d6e558b6e",
     "lint-staged": "^7.0.2",
     "localforage": "^1.7.1",
     "lodash-es": "^4.17.14",
diff --git a/yarn.lock b/yarn.lock
index 46f88806e..76ff570ae 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6894,17 +6894,29 @@ lazy-val@^1.0.3, lazy-val@^1.0.4:
     yargs "^13.2.2"
     zstd-codec "^0.1.1"
 
+<<<<<<< HEAD
 lbry-redux@lbryio/lbry-redux#6bd56492ad15a0e761b087db29a5441e9b9a04f0:
   version "0.0.1"
   resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/6bd56492ad15a0e761b087db29a5441e9b9a04f0"
+=======
+lbry-redux@lbryio/lbry-redux#01614094dae83263e213e03319573e34cc922995:
+  version "0.0.1"
+  resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/01614094dae83263e213e03319573e34cc922995"
+>>>>>>> update lbry-redux and lbryinc
   dependencies:
     proxy-polyfill "0.1.6"
     reselect "^3.0.0"
     uuid "^3.3.2"
 
+<<<<<<< HEAD
 lbryinc@lbryio/lbryinc#f8bba34b34599a8450ced842b29336d1117d050d:
   version "0.0.1"
   resolved "https://codeload.github.com/lbryio/lbryinc/tar.gz/f8bba34b34599a8450ced842b29336d1117d050d"
+=======
+lbryinc@lbryio/lbryinc#d250096a6fc5df16be4f82812ecce28d6e558b6e:
+  version "0.0.1"
+  resolved "https://codeload.github.com/lbryio/lbryinc/tar.gz/d250096a6fc5df16be4f82812ecce28d6e558b6e"
+>>>>>>> update lbry-redux and lbryinc
   dependencies:
     reselect "^3.0.0"