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

Reviewed-by: seancribbs