Resolve z-y-drv mount conflict