new house page
resolved conflix