updated manifest
manifest merge