fix: merge error
fix: merge error

pipermerriam/pyethereum,ddworken/pyethereum,karlfloersch/pyethereum,vaporry/pyethereum,ckeenan/pyethereum,karlfloersch/pyethereum,jnnk/pyethereum,holiman/pyethereum,shahankhatch/pyethereum,ethereum/pyethereum,harlantwood/pyethereum,ethermarket/pyethereum,shahankhatch/pyethereum,pipermerriam/pyethereum,inzem77/pyethereum,ethereum/pyethereum