fs: Fix merge error