spec out how i suspect conflict resolution works
Don't attempt conflict resolution, let reloading handle it
Merge pull request #192 from basho/bk-integration-test-conflict-resolution

Add integration specs for conflict resolution
force conflict resolution with hooks and ten sides
conflict resolution spec depends on allow_mult
Merge pull request #195 from basho/bk-force-conflict-resolution

Fix conflict resolution specs

Reviewed-by: bkerley
Merge branch 'master' into bk-bucket-type-api