manifest merge fix