Fix merge conflict.
Fix merge conflict.

blockstack/blockstack-portal,blockstack/blockstack-browser,blockstack/blockstack-browser,blockstack/blockstack-browser,blockstack/blockstack-portal,blockstack/blockstack-portal,blockstack/blockstack-portal,blockstack/blockstack-browser,blockstack/blockstack-browser,blockstack/blockstack-portal,blockstack/blockstack-browser