Fix manifest
merge