fixed Jar merging