add bundle
delete Acme bundle
add new bundle
resolve conflict