voice command stuff merge fix