Java docs
Fixed merge conflict