Skip noise word 'set' in update sync
Give better output when setting conflict_strategy, and do some basic validation.
Allow conflict as an alias