I have tested conflict resolution and it is not supported now - newer changes overwrites older changes. Is it in task list for next version(s) to support the conflict resolution (e.g. by allowing user to select use source, use destination, keep both) ?