codegen mega merge