vendor/cm merge