Update merge issues with VPS.