The boundaries of Tel Aviv and Jaffa became a matter of contention between the Tel Aviv municipality and the Israeli government during 1948.[47] The former wished to incorporate only the northern Jewish suburbs of Jaffa, while the latter wanted a more complete unification.[47] The issue also had international sensitivity, since the main part of Jaffa was in the Arab portion of the United Nations Partition Plan, whereas Tel Aviv was not, and no armistice agreements had yet been signed.[47] On 10 December 1948, the government announced the annexation to Tel Aviv of Jaffa's Jewish suburbs, the Arab neighborhood of Abu Kabir, the Arab village of Salama and some of its agricultural land, and the working class Jewish area of Hatikva.[47] On 25 February 1949, the depopulated Arab village of Sheikh Muanis was also annexed to Tel Aviv.[47] On 18 May 1949, the Arab neighborhood of Manshiya and part of Jaffa's central zone were added, for the first time including land that had been in the Arab portion of the UN partition plan.[47] The government decided on a permanent unification of Tel Aviv and Jaffa on 4 October 1949, but the actual unification was delayed until 24 April 1950 due to concerted opposition from Tel Aviv's mayor Israel Rokach.[47] The name of the unified city was Tel Aviv until 19 August 1950, when it was renamed as Tel Aviv-Yafo in order to preserve the historical name Jaffa.[47]
