javadoc: complete merge