conflict_resolver: don't add blockrefs when journaling is enabled
conflict_resolver: don't add blockrefs when journaling is enabled

Issue: KBFS-1531

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