adapt manifest.yml
merge