polish LWW vs timestamp sections
add section on allow_mult and bucket types
final changes
Merge branch 'bugs/lp/conflict-resolution-changes' into lp/conflict-resolution-example