and the city of Tokyo ( 東京市 , Tōkyō-shi ? )
and the former city of Tokyo ( 東京市 , Tōkyō-shi ? )