fix merge conflicts

dist/bundle.es.js

@@ -3924,7 +3924,7 @@ const doUpdateSearchQuery = (query, shouldSkipSuggestions) => dispatch => {
 };
 
 const doSearch = (rawQuery, size, // only pass in if you don't want to use the users setting (ex: related content)
-from, isBackgroundSearch = false, options = {}) => (dispatch, getState) => {
+from, isBackgroundSearch = false, options = {}, resolveResults = true) => (dispatch, getState) => {
   const query = rawQuery.replace(/^lbry:\/\//i, '').replace(/\//, ' ');
 
   if (!query) {
@@ -3973,7 +3973,9 @@ from, isBackgroundSearch = false, options = {}) => (dispatch, getState) => {
         }
 
         const url = buildURI(urlObj);
-        actions.push(doResolveUri(url));
+        if (resolveResults) {
+          actions.push(doResolveUri(url));
+        }
         uris.push(url);
       }
     });

src/redux/actions/search.js

@@ -81,7 +81,8 @@ export const doSearch = (
   isBackgroundSearch: boolean = false,
   options: {
     related_to?: string,
-  } = {}
+  } = {},
+  resolveResults: boolean = true
 ) => (dispatch: Dispatch, getState: GetState) => {
   const query = rawQuery.replace(/^lbry:\/\//i, '').replace(/\//, ' ');
 
@@ -135,7 +136,9 @@ export const doSearch = (
           }
 
           const url = buildURI(urlObj);
-          actions.push(doResolveUri(url));
+          if (resolveResults) {
+            actions.push(doResolveUri(url));
+          }
           uris.push(url);
         }
       });

src/redux/selectors/claims.js

@@ -260,8 +260,8 @@ export const makeSelectDateForUri = (uri: string) =>
         (claim.value.release_time
           ? claim.value.release_time * 1000
           : claim.meta && claim.meta.creation_timestamp
-          ? claim.meta.creation_timestamp * 1000
+            ? claim.meta.creation_timestamp * 1000
-          : null);
+            : null);
       if (!timestamp) {
         return undefined;
       }