add javadoc
merging