fixed merge regression
fixed merge regression

Tetchain/tetchaind,metronotes-beta/metronotesd,CounterpartyXCP/counterparty-lib,Paytokens/paytokensd,ClearingHouse/clearinghoused,tokenly/counterparty-lib,monaparty/counterparty-lib,Dogeparty/dogepartyd,CounterpartyXCP/counterparty-lib,patricklodder/dogepartyd,jarymoth/counterpartyd,paytokens-beta/paytokensd,Metronote/metronotesd-alpha,Reddcraft/reddcraftd,Ziftr/counterpartyd,coinwarp/dogeparty-lib,F483/counterparty-lib,Ziftr/counterpartyd,ClearingHouse/clearinghoused,monaparty/counterparty-lib,Litetokens/litetokensd,Tetchain/tetchaind,Peertokens/peertokensd,F483/counterparty-lib,Reddcraft/reddcraftd,gotcha/testcounter,Bluejudy/bluejudyd,stefcrypto/counterparty-lib,Czarparty/czarpartyd,Dogeparty/dogepartyd,Bluejudy/bluejudyd