fixed mistake because of conflict resolving
fixed mistake because of conflict resolving

gluk256/solidity,ruchevits/solidity,LianaHus/solidity,ruchevits/solidity,arkpar/solidity,chriseth/solidity-doc-test,ethers/solidity,debris/solidity,chriseth/solidity,vaporry/solidity,LefterisJP/solidity,ruchevits/solidity,ruchevits/solidity,shahankhatch/solidity,douglas-larocca/solidity