diff --git a/dist/bundle.es.js b/dist/bundle.es.js
index bc5368f..71bf2e5 100644
--- a/dist/bundle.es.js
+++ b/dist/bundle.es.js
@@ -2000,11 +2000,7 @@ function doResolveUris(uris, returnCachedClaims = false) {
               result.stream = uriResolveInfo;
               if (uriResolveInfo.signing_channel) {
                 result.channel = uriResolveInfo.signing_channel;
-<<<<<<< HEAD
                 result.claimsInChannel = uriResolveInfo.signing_channel.meta && uriResolveInfo.signing_channel.meta.claims_in_channel || 0;
-=======
-                result.claimsInChannel = uriResolveInfo.meta && uriResolveInfo.meta.claims_in_channel || 0;
->>>>>>> add tags
               }
             }
             // $FlowFixMe
@@ -2125,11 +2121,7 @@ function doFetchClaimsByChannel(uri, page = 1) {
 
     lbryProxy.claim_search({
       channel: uri,
-<<<<<<< HEAD
-      valid_channel_signatures: true,
-=======
-      is_controlling: true,
->>>>>>> add tags
+      valid_channel_signature: true,
       page: page || 1,
       order_by: ['release_time']
     }).then(result => {
diff --git a/dist/flow-typed/Claim.js b/dist/flow-typed/Claim.js
index 20b8ff0..1c61c10 100644
--- a/dist/flow-typed/Claim.js
+++ b/dist/flow-typed/Claim.js
@@ -3,8 +3,7 @@
 declare type Claim = StreamClaim | ChannelClaim;
 
 declare type ChannelClaim = GenericClaim & {
-  is_channel_signature_valid?: boolean, // we may have signed channels in the future, fixes some flow issues for now.
-  signing_channel?: ChannelClaim,
+  is_channel_signature_valid?: boolean, // we may have signed channels in the future
   value: ChannelMetadata,
 };