merging prom/pending code (manifest)