folder_block_ops: Fix missed rebase conflict
folder_block_ops: Fix missed rebase conflict

keybase/kbfs,keybase/kbfs,keybase/client,keybase/client,keybase/client,keybase/client,keybase/client,keybase/client,keybase/client,keybase/client,keybase/client,keybase/kbfs,keybase/client,keybase/client,keybase/kbfs,keybase/client