Walt Disney Parks and Resorts and its Florida oversight board have agreed to a settlement that ends state litigation filed by the parties over governance and development of the company’s Orlando-area theme parks.

The agreement between Disney and the Central Florida Tourism Oversight District (CFTOD) was signed in the final week of March, resulting in the dismissal of dueling state lawsuits in the Ninth Judicial Circuit Court in Orange County. Under the terms of the agreement, Disney agreed that certain development agreements passed in the final days of its former oversight entity, the Reedy Creek Improvement District, are null and void, putting a 2020 comprehensive plan back in force.

“The district shall resolve to begin immediately to review, evaluate and amend the 2020 comprehensive plan pursuant to its statutory obligations and shall consult with Disney and other appropriate parties during the process,” the settlement states.