fixed framework.jar merge error