fix manifest
Fixed merge conflicts