folder_branch_ops: return unmerged conflict if CR completed
folder_branch_ops: return unmerged conflict if CR completed

Suggested by @akalin-keybase

Issue: #189

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