merge error
merge error

lontivero/NBitcoin,MetacoSA/NBitcoin,you21979/NBitcoin,NicolasDorier/NBitcoin,bitcoinbrisbane/NBitcoin,stratisproject/NStratis,dangershony/NStratis,MetacoSA/NBitcoin,thepunctuatedhorizon/BrickCoinAlpha.0.0.1,HermanSchoenfeld/NBitcoin