The city of LOCATION@1 was a district-free city until NUMBER@1 and was then incorporated into the district .

The city of LOCATION@1 was a district-free city until NUMBER@1 and was then made part of the district .
