fixing home page merge