Deal to avoid eviction cliff reached