German ⇄ Danish Dutch English Finnish French Greek Italian Portuguese Russian Spanish Swedish

Konfliktauflösung f
commun.	conflict control; contention control (bus)
comp., MS	conflict resolution (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)
IT	conflict resolution