merged and solved conflicts
javadoc