diplomatic solution