# Conflicts:
#	README.fh.md

… for v2

# Conflicts:
#	cmd/geth/main.go
#	core/state_processor.go
#	deepmind/context.go

# Conflicts:
#	core/vm/interpreter.go

Removed some gas event left over elements.

# Conflicts:
#	deepmind/context.go

# Conflicts:
#	core/state_processor.go
#	core/vm/interpreter.go
#	deepmind/context.go

# Conflicts:
#	cmd/devp2p/main.go
#	cmd/geth/main.go
#	core/blockchain.go
#	internal/debug/flags.go
#	params/version.go

…determinism

…rror even "clearer"

# Conflicts:
#	accounts/abi/bind/backends/simulated.go
#	cmd/geth/main.go
#	cmd/geth/retesteth.go
#	consensus/clique/clique.go
#	consensus/consensus.go
#	consensus/ethash/consensus.go
#	core/blockchain.go
#	core/state/state_object.go
#	core/state/statedb.go
#	core/state/sync_test.go
#	core/state_prefetcher.go
#	core/state_processor.go
#	core/state_transition.go
#	core/tx_pool_test.go
#	core/vm/contract.go
#	core/vm/contracts.go
#	core/vm/contracts_test.go
#	core/vm/evm.go
#	core/vm/gas_table_test.go
#	core/vm/instructions.go
#	core/vm/instructions_test.go
#	core/vm/interpreter.go
#	core/vm/logger_test.go
#	core/vm/runtime/env.go
#	core/vm/runtime/runtime.go
#	eth/api_backend.go
#	eth/sync.go
#	eth/tracers/api.go
#	eth/tracers/tracer_test.go
#	eth/tracers/tracers_test.go
#	ethdb/leveldb/leveldb.go
#	firehose/context_test.go
#	firehose/validation.go
#	firehose/validation_test.go
#	graphql/graphql.go
#	internal/ethapi/api.go
#	internal/ethapi/backend.go
#	les/api_backend.go
#	les/odr_test.go
#	light/odr_test.go
#	miner/worker.go
#	tests/state_test_util.go
#	tests/vm_test_util.go

…don't fail

# Conflicts:
#	core/vm/evm.go

# Conflicts:
#	core/vm/evm.go

…ddress, advertise as fh2.1