fs: fix bad merge