nfs: fix bad merge