Long-running dispute over ownership of land is resolved, allowing cities to cooperate on project that will bring benefits to both sides