Merge "Merge (don't overwrite) $NOVA_CPU_CONF"