conflict resolution(Angleško) Noun A process that enables you to view an item that has been changed on both your desktop computer and mobile device, and select which version of the item you want to keep.
Nemško: Konfliktauflösung Špansko: resolución de conflictos Francosko: résolution de conflit Hrvaško: rješavanje sukoba Italijansko: risoluzione del conflitto Slovensko: razreševanje sporov