Fixed manifest conflict