fixed merge error with the manifest