riak: gracefully resolve conflicts

[struktured]

Need to set the bucket type to a reasonable policy, or create a custom resolution scheme that takes advantage of the incremental update rules to aggregate them together. thanks to @pat227 for noting this.