state: add another test for conflict check
state: add another test for conflict check

ericsnowcurrently/juju,dimitern/juju,mhilton/juju,reedobrien/juju,voidspace/juju,thomnico/juju,mjs/juju,waigani/juju,Altoros/juju-cloudsigma,marcmolla/juju,alesstimec/juju,wwitzel3/juju,bac/juju,wwitzel3/juju,thomnico/juju,Altoros/juju-cloudsigma,bz2/juju,davecheney/juju,bac/juju,fwereade/juju,bz2/juju,fwereade/juju,AdamIsrael/juju,kat-co/juju,macgreagoir/juju,Altoros/juju-cloudsigma,mjs/juju,kat-co/juju,gabriel-samfira/juju,frankban/juju-tmp,bac/juju,frankban/juju,thomnico/juju,tych0/juju,tasdomas/juju,dooferlad/juju,marcmolla/juju,alesstimec/juju,waigani/juju,bac/juju,alesstimec/juju,fwereade/juju,axw/juju,mhilton/juju-juju,waigani/juju,gabriel-samfira/juju,frankban/juju-tmp,davecheney/juju,dooferlad/juju,mikemccracken/juju,makyo/juju,reedobrien/juju,gabriel-samfira/juju,perrito666/juju,ericsnowcurrently/juju,bogdanteleaga/juju,perrito666/juju,axw/juju,ericsnowcurrently/juju,cloud-green/juju,waigani/juju,anastasiamac/juju,dooferlad/juju,macgreagoir/juju,davecheney/juju,perrito666/juju,bogdanteleaga/juju,tych0/juju,tsakas/juju,howbazaar/juju,kat-co/juju,gabriel-samfira/juju,tsakas/juju,kat-co/juju,tsakas/juju,reedobrien/juju,bz2/juju,mhilton/juju,dimitern/juju,perrito666/juju,wwitzel3/juju,mikemccracken/juju,ericsnowcurrently/juju,howbazaar/juju,dimitern/juju,macgreagoir/juju,anastasiamac/juju,macgreagoir/juju,anastasiamac/juju,anastasiamac/juju,tasdomas/juju,alesstimec/juju,bz2/juju,mjs/juju,axw/juju,tych0/juju,cloud-green/juju,dimitern/juju,AdamIsrael/juju,ericsnowcurrently/juju,cloud-green/juju,tasdomas/juju,frankban/juju,frankban/juju,mhilton/juju-juju,perrito666/juju,mjs/juju,bz2/juju,frankban/juju-tmp,tasdomas/juju,voidspace/juju,cloud-green/juju,mhilton/juju,bac/juju,AdamIsrael/juju,mhilton/juju,wwitzel3/juju,mhilton/juju-juju,makyo/juju,mjs/juju,tsakas/juju,makyo/juju,davecheney/juju,howbazaar/juju,alesstimec/juju,mjs/juju,bogdanteleaga/juju,reedobrien/juju,dooferlad/juju,gabriel-samfira/juju,voidspace/juju,AdamIsrael/juju,bogdanteleaga/juju,dooferlad/juju,marcmolla/juju,voidspace/juju,axw/juju,mikemccracken/juju,frankban/juju,howbazaar/juju,mhilton/juju-juju,mikemccracken/juju,howbazaar/juju,tych0/juju,marcmolla/juju,marcmolla/juju,kat-co/juju,dimitern/juju,makyo/juju,mikemccracken/juju,mjs/juju,macgreagoir/juju,frankban/juju,anastasiamac/juju,axw/juju,fwereade/juju,reedobrien/juju,frankban/juju-tmp,Altoros/juju-cloudsigma,thomnico/juju