Fix Merge and classpath