implemented txlock conflict resolution
implemented txlock conflict resolution

inkvisit/sarmacoins,benzmuircroft/REWIRE.io,Vsync-project/Vsync,HeliumGas/helium,putinclassic/putic,worldbit/worldbit,freelion93/mtucicoin,inkvisit/sarmacoins,ediston/energi,Vsync-project/Vsync,LIMXTEC/DMDv3,CoinProjects/AmsterdamCoin-v4,thelazier/dash,HeliumGas/helium,BlockchainTechLLC/3dcoin,basicincome/unpcoin-core,xuyangcn/opalcoin,alejandromgk/Lunar,ahmedbodi/test2,dashpay/dash,ionomy/ion,coinkeeper/2015-06-22_18-36_darkcoin,antcheck/antcoin,lakepay/lake,ionomy/ion,pinkevich/dash,terracoin/terracoin,rsdevgun16e/energi,ahmedbodi/test2,alejandromgk/Lunar,antcheck/antcoin,ediston/energi,knolza/gamblr,ticclassic/ic,biblepay/biblepay,blood2/bloodcoin-0.9,rsdevgun16e/energi,ivansib/sibcoin,48thct2jtnf/P,Bloom-Project/Bloom,cryptodev35/icash,ticclassic/ic,nightlydash/darkcoin,inkvisit/sarmacoins,ivansib/sibcoin,nmarley/dash,willwray/dash,Mrs-X/PIVX,willwray/dash,ColossusCoinXT/ColossusCoinXT,biblepay/biblepay,willwray/dash,biblepay/biblepay,LIMXTEC/DMDv3,kbccoin/kbc,ArgonToken/ArgonToken,Vsync-project/Vsync,DMDcoin/Diamond,Vsync-project/Vsync,alejandromgk/Lunar,rdqw/sscoin,terracoin/terracoin,ediston/energi,thelazier/dash,schinzelh/dash,npccoin/npccoin,PandaPayProject/PandaPay,cerebrus29301/crowncoin,dmrtsvetkov/flowercoin,ahmedbodi/test2,thelazier/dash,kbccoin/kbc,slingcoin/sling-market,ivansib/sib16,xuyangcn/opalcoin,RyanLucchese/energi,putinclassic/putic,grumpydevelop/singularity,axelxod/braincoin,dashpay/dash,npccoin/npccoin,pinkevich/dash,antcheck/antcoin,knolza/gamblr,nmarley/dash,CoinProjects/AmsterdamCoin-v4,puticcoin/putic,diggcoin/diggcoin,UdjinM6/dash,kbccoin/kbc,ColossusCoinXT/ColossusCoinXT,slingcoin/sling-market,mycointest/owncoin,midnight-miner/LasVegasCoin,axelxod/braincoin,mycointest/owncoin,Bloom-Project/Bloom,crowning2/dash,Vsync-project/Vsync,rsdevgun16e/energi,cerebrus29301/crowncoin,lakepay/lake,npccoin/npccoin,Darknet-Crypto/Darknet,puticcoin/putic,worldbit/worldbit,ionomy/ion,UdjinM6/dash,world-bank/unpay-core,dmrtsvetkov/flowercoin,terracoin/terracoin,aspirecoin/aspire,CoinProjects/AmsterdamCoin-v4,keesdewit82/LasVegasCoin,midnight-miner/LasVegasCoin,dev1972/Satellitecoin,dashpay/dash,DMDcoin/Diamond,ivansib/sibcoin,grumpydevelop/singularity,Bloom-Project/Bloom,lakepay/lake,world-bank/unpay-core,UdjinM6/dash,Petr-Economissa/gvidon,grumpydevelop/singularity,schinzelh/dash,xuyangcn/opalcoin,cerebrus29301/crowncoin,knolza/gamblr,ediston/energi,keesdewit82/LasVegasCoin,grumpydevelop/singularity,DMDcoin/Diamond,grumpydevelop/singularity,crowning-/dash,inkvisit/sarmacoins,LIMXTEC/DMDv3,worldbit/worldbit,ivansib/sibcoin,mycointest/owncoin,dmrtsvetkov/flowercoin,rsdevgun16e/energi,ticclassic/ic,Bloom-Project/Bloom,jmgilbert2/energi,48thct2jtnf/P,projectinterzone/ITZ,LIMXTEC/DMDv3,Bloom-Project/Bloom,willwray/dash,HeliumGas/helium,ivansib/sib16,projectinterzone/ITZ,benzmuircroft/REWIRE.io,pinkevich/dash,worldbit/worldbit,antcheck/antcoin,PIVX-Project/PIVX,Mrs-X/PIVX,terracoin/terracoin,dmrtsvetkov/flowercoin,Petr-Economissa/gvidon,basicincome/unpcoin-core,Darknet-Crypto/Darknet,slingcoin/sling-market,presstab/PIVX,rdqw/sscoin,kbccoin/kbc,cryptodev35/icash,world-bank/unpay-core,cerebrus29301/crowncoin,willwray/dash,nmarley/dash,presstab/PIVX,ivansib/sib16,grumpydevelop/singularity,inkvisit/sarmacoins,nmarley/dash,ticclassic/ic,benzmuircroft/REWIRE.io,midnight-miner/LasVegasCoin,ivansib/sibcoin,48thct2jtnf/P,diggcoin/diggcoin,mycointest/owncoin,Darknet-Crypto/Darknet,PIVX-Project/PIVX,npccoin/npccoin,ColossusCoinXT/ColossusCoinXT,RyanLucchese/energi,ticclassic/ic,RyanLucchese/energi,pinkevich/dash,xuyangcn/opalcoin,nightlydash/darkcoin,cerebrus29301/crowncoin,mycointest/owncoin,PandaPayProject/PandaPay,axelxod/braincoin,Petr-Economissa/gvidon,aspirecoin/aspire,mobicoins/mobicoin-core,CoinProjects/AmsterdamCoin-v4,PandaPayProject/PandaPay,ticclassic/ic,dev1972/Satellitecoin,ediston/energi,nmarley/dash,rdqw/sscoin,mobicoins/mobicoin-core,terracoin/terracoin,aspirecoin/aspire,BlockchainTechLLC/3dcoin,antcheck/antcoin,PandaPayProject/PandaPay,cryptodev35/icash,diggcoin/diggcoin,dmrtsvetkov/flowercoin,presstab/PIVX,DMDcoin/Diamond,keesdewit82/LasVegasCoin,ArgonToken/ArgonToken,schinzelh/dash,schinzelh/dash,midnight-miner/LasVegasCoin,knolza/gamblr,rdqw/sscoin,LIMXTEC/DMDv3,rdqw/sscoin,slingcoin/sling-market,crowning-/dash,axelxod/braincoin,ColossusCoinXT/ColossusCoinXT,axelxod/braincoin,rsdevgun16e/energi,mobicoins/mobicoin-core,terracoin/terracoin,DMDcoin/Diamond,ahmedbodi/test2,ivansib/sib16,presstab/PIVX,npccoin/npccoin,slingcoin/sling-market,schinzelh/dash,jmgilbert2/energi,blood2/bloodcoin-0.9,benzmuircroft/REWIRE.io,keesdewit82/LasVegasCoin,Petr-Economissa/gvidon,jmgilbert2/energi,Mrs-X/Darknet,PIVX-Project/PIVX,Mrs-X/PIVX,crowning-/dash,inkvisit/sarmacoins,PIVX-Project/PIVX,knolza/gamblr,HeliumGas/helium,PIVX-Project/PIVX,ivansib/sib16,aspirecoin/aspire,UdjinM6/dash,Petr-Economissa/gvidon,alejandromgk/Lunar,nightlydash/darkcoin,PandaPayProject/PandaPay,kbccoin/kbc,ahmedbodi/test2,RyanLucchese/energi,cerebrus29301/crowncoin,biblepay/biblepay,dashpay/dash,puticcoin/putic,basicincome/unpcoin-core,projectinterzone/ITZ,projectinterzone/ITZ,Petr-Economissa/gvidon,midnight-miner/LasVegasCoin,crowning-/dash,Mrs-X/Darknet,pinkevich/dash,nightlydash/darkcoin,cryptodev35/icash,RyanLucchese/energi,DMDcoin/Diamond,jmgilbert2/energi,dashpay/dash,coinkeeper/2015-06-22_18-36_darkcoin,ArgonToken/ArgonToken,mobicoins/mobicoin-core,blood2/bloodcoin-0.9,crowning2/dash,crowning-/dash,HeliumGas/helium,presstab/PIVX,PIVX-Project/PIVX,jmgilbert2/energi,presstab/PIVX,dev1972/Satellitecoin,pinkevich/dash,freelion93/mtucicoin,freelion93/mtucicoin,Darknet-Crypto/Darknet,npccoin/npccoin,48thct2jtnf/P,48thct2jtnf/P,Darknet-Crypto/Darknet,BlockchainTechLLC/3dcoin,Mrs-X/PIVX,ionomy/ion,mycointest/owncoin,ColossusCoinXT/ColossusCoinXT,pelorusjack/BlockDX,48thct2jtnf/P,LIMXTEC/DMDv3,dev1972/Satellitecoin,PandaPayProject/PandaPay,UdjinM6/dash,basicincome/unpcoin-core,pelorusjack/BlockDX,benzmuircroft/REWIRE.io,worldbit/worldbit,aspirecoin/aspire,crowning-/dash,PIVX-Project/PIVX,ahmedbodi/test2,pelorusjack/BlockDX,dmrtsvetkov/flowercoin,pelorusjack/BlockDX,ArgonToken/ArgonToken,diggcoin/diggcoin,knolza/gamblr,biblepay/biblepay,keesdewit82/LasVegasCoin,ionomy/ion,putinclassic/putic,midnight-miner/LasVegasCoin,biblepay/biblepay,projectinterzone/ITZ,crowning2/dash,ArgonToken/ArgonToken,BlockchainTechLLC/3dcoin,puticcoin/putic,willwray/dash,ionomy/ion,PIVX-Project/PIVX,thelazier/dash,freelion93/mtucicoin,antcheck/antcoin,world-bank/unpay-core,world-bank/unpay-core,worldbit/worldbit,freelion93/mtucicoin,nightlydash/darkcoin,coinkeeper/2015-06-22_18-36_darkcoin,biblepay/biblepay,ediston/energi,ColossusCoinXT/ColossusCoinXT,thelazier/dash,diggcoin/diggcoin,puticcoin/putic,PIVX-Project/PIVX,ArgonToken/ArgonToken,Mrs-X/Darknet,benzmuircroft/REWIRE.io,aspirecoin/aspire,slingcoin/sling-market,Mrs-X/PIVX,BlockchainTechLLC/3dcoin,blood2/bloodcoin-0.9,freelion93/mtucicoin,mobicoins/mobicoin-core,Mrs-X/Darknet,rsdevgun16e/energi,xuyangcn/opalcoin,schinzelh/dash,dev1972/Satellitecoin,rdqw/sscoin,basicincome/unpcoin-core,nmarley/dash,axelxod/braincoin,crowning2/dash,lakepay/lake,Mrs-X/PIVX,Mrs-X/Darknet,Vsync-project/Vsync,biblepay/biblepay,lakepay/lake,alejandromgk/Lunar,BlockchainTechLLC/3dcoin,CoinProjects/AmsterdamCoin-v4,coinkeeper/2015-06-22_18-36_darkcoin,pelorusjack/BlockDX,dev1972/Satellitecoin,keesdewit82/LasVegasCoin,Mrs-X/Darknet,pelorusjack/BlockDX,crowning2/dash,putinclassic/putic,diggcoin/diggcoin,jmgilbert2/energi,ivansib/sibcoin,nmarley/dash,HeliumGas/helium,alejandromgk/Lunar,Bloom-Project/Bloom,ivansib/sib16,blood2/bloodcoin-0.9,cryptodev35/icash,lakepay/lake,puticcoin/putic,Darknet-Crypto/Darknet,putinclassic/putic,CoinProjects/AmsterdamCoin-v4,xuyangcn/opalcoin,RyanLucchese/energi,putinclassic/putic,coinkeeper/2015-06-22_18-36_darkcoin