Fix merge issues with VPS.