Added list layout for residences
Fixed merge error with strings.xml