Resolve bitcoind conflict

Please modify your source code so it does not conflict with bitcoind; also make necessary changes in other locations as well :)