Fix javadoc merge issue