Updated manifest
Merge