[Vm-dev] Re: a problem merging latest changes