solve javadoc conflict