From Conflict to Inclusion in Housing