merge javalib2