merge home page with master