sensible defaults for conflict handling
Ideally, syncs should never raise error in conflicts unless there is no way to solve it. This might involve the design of type-specific heuristics to solve conflicts on a SoledadDocument type basis, client side.
(from redmine: created on 2015-12-01)