manifest: some merge