mm: Fix VMR merge issues