fix manifest conflict