FS: block-dev: Fixing bad merge