merge with dev VM's mk.conf