Fixed error from merge in the manifest