fixed home page merge