add homeless
merge