Bitter airport feud ends with peace treaty