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