fix merge conflict from removed bitcoinjs-min.js