merge home1.0