Conflicts: ethcore/src/miner/miner.rs parity/cli/config.full.toml parity/cli/mod.rs parity/configuration.rs