fix merge conflict resolve error
fix merge conflict resolve error
dimitern/juju,marcoceppi/juju,Altoros/juju-cloudsigma,frobware/juju,ericsnowcurrently/juju,tsakas/juju,frankban/juju,voidspace/juju,perrito666/juju,tych0/juju,thomnico/juju,cmars/juju,mjs/juju,sinzui/juju,mjs/juju,frobware/juju,marcoceppi/juju,mjs/juju,makyo/juju,mjs/juju,mikemccracken/juju,howbazaar/juju,Altoros/juju-vmware,davecheney/juju,AdamIsrael/juju,fwereade/juju,axw/juju,bz2/juju,gabriel-samfira/juju,dimitern/juju,mhilton/juju-juju,jrwren/juju,gabriel-samfira/juju,mjs/juju,alesstimec/juju,makyo/juju,cherylj/juju,sinzui/juju,anastasiamac/juju,dimitern/juju,voidspace/juju,cherylj/juju,thomnico/juju,waigani/juju,Altoros/juju-vmware,tych0/juju,mhilton/juju,rogpeppe/juju,marcmolla/juju,gabriel-samfira/juju,kat-co/juju,macgreagoir/juju,anastasiamac/juju,gabriel-samfira/juju,ericsnowcurrently/juju,fwereade/juju,gabriel-samfira/juju,wwitzel3/juju,mhilton/juju-juju,perrito666/juju,tasdomas/juju,mhilton/juju,kat-co/juju,Altoros/juju-vmware,reedobrien/store,alesstimec/juju,tsakas/juju,bogdanteleaga/juju,dooferlad/juju,Altoros/juju-cloudsigma,mattyw/juju,Altoros/juju-vmware,frankban/juju-tmp,cherylj/juju,mhilton/juju,tych0/juju,makyo/juju,fwereade/juju,Altoros/juju-cloudsigma,cloud-green/juju,kat-co/juju,axw/juju,mhilton/juju-juju,davecheney/juju,fwereade/juju,ericsnowcurrently/juju,anastasiamac/juju,mhilton/juju-juju,dooferlad/juju,howbazaar/juju,marcmolla/juju,rogpeppe/juju,frobware/juju,bz2/juju,tasdomas/juju,reedobrien/juju,bogdanteleaga/juju,macgreagoir/juju,AdamIsrael/juju,cmars/juju,cloud-green/juju,voidspace/juju,davecheney/juju,bogdanteleaga/juju,ericsnowcurrently/juju,wwitzel3/juju,mikemccracken/juju,mjs/juju,mattyw/juju,jrwren/juju,sinzui/juju,marcmolla/juju,axw/juju,frankban/juju,AdamIsrael/juju,frankban/juju,waigani/juju,dimitern/juju,mattyw/juju,perrito666/juju,cherylj/juju,reedobrien/juju,macgreagoir/juju,mikemccracken/juju,bz2/juju,waigani/juju,alesstimec/juju,tasdomas/juju,reedobrien/juju,makyo/juju,perrito666/juju,marcoceppi/juju,mikemccracken/juju,mhilton/juju,anastasiamac/juju,bz2/juju,dimitern/juju,voidspace/juju,frankban/juju-tmp,bac/juju,kat-co/juju,frankban/juju,macgreagoir/juju,marcoceppi/juju,bz2/juju,howbazaar/juju,bac/juju,thomnico/juju,axw/juju,bac/juju,cloud-green/juju,tasdomas/juju,bac/juju,reedobrien/juju,jrwren/juju,mikemccracken/juju,mjs/juju,macgreagoir/juju,howbazaar/juju,cloud-green/juju,dooferlad/juju,frankban/juju-tmp,tsakas/juju,tych0/juju,bac/juju,frankban/juju,rogpeppe/juju,marcmolla/juju,reedobrien/juju,perrito666/juju,frankban/juju-tmp,axw/juju,cmars/juju,ericsnowcurrently/juju,howbazaar/juju,alesstimec/juju,mattyw/juju,marcmolla/juju,alesstimec/juju,dooferlad/juju,kat-co/juju,cmars/juju,wwitzel3/juju,wwitzel3/juju,Altoros/juju-cloudsigma,tsakas/juju,AdamIsrael/juju,thomnico/juju,sinzui/juju,dooferlad/juju,anastasiamac/juju,davecheney/juju,bogdanteleaga/juju,waigani/juju