nfs: fix bad merge part 2