Main production merge