WIP: Conflict Resolution changes

In light of @russelldb comments [here](https://github.com/basho/riak_ee/issues/265)