javaDoc updated
fix conflicts