A mix of all of the above. Sometimes areas were uninhabited when new people arrived, sometimes they displaced older groups, sometimes they mixed. Sometimes it was a combination where there was some mixing and some displacement. There is a lot of debate about how many waves there were.