From Territorial Dispute to Diplomatic Partnership