merge + mainnet changes