Merge master and vm.