add java version
fix merge