updated manifest to merge upstream