fixed Manifest merge error