search and view household
merge conflict