Diplomatic solution