in the process of fixing the houses show
merge conflicts