cr_basic_conflicts_test: fix regex matching on new tests
cr_basic_conflicts_test: fix regex matching on new tests

Issue: KBFS-1163

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