[Syncevolution-issues] [Bug 1790] New: [Watching 1364] SyncML server: conflict resolution