DOHA (Al Jazeera) – Qatar and Bahrain are resolving a years-long dispute and restoring diplomatic ties. Delegates from the two countries have met at the headquarters of the Persian Gulf Cooperation Council (GCC) General Secretariat in the Saudi capital, Riyadh, the countries’ foreign ministries said in separate statements. Both sides met to “enhance the Persian Gulf unity and integration according to the GCC Charter”, Qatar’s foreign ministry said in its statement. Qatar’s Ministry of Foreign Affairs Secretary-General Ahmed bin Hassan al-Hammadi met with Bahrain’s Ministry of Foreign Affairs Undersecretary for Political Affairs Sheikh Abdulla bin Ahmed Al Khalifa to discuss resolving a feud that dates back to 2017.