Resolving conflicts: Diplomacy works