Fixed manifest merge error