fix merge javadoc
fix javadoc failure merge