The history of modern Jaffa can be traced back to 1948. The city's largely Arab population was driven out during fighting that turned into the larger Arab-Israeli conflict of that year. The city was re-settled by Jewish immigrants from Arab and other states. The tremendous growth of population led to its incorporation into Tel Aviv the following decade.