Prepare for hardfork merge