[Vm-dev] a problem merging latest changes