Resolving vmware merge issues