fix(mempool): reconcile conflicts before insertion - #254

fix(mempool): reconcile conflicts before insertion#254

EddieHouston wants to merge 2 commits into

Blockstream:new-indexBlockstream/electrs:new-indexfrom

EddieHouston:fix/mempool-conflict-reconciliationEddieHouston/electrs:fix/mempool-conflict-reconciliationCopy head branch name to clipboard