javadoc for merge