to resolve a conflict - Turkish English Dictionary