JavaDoc fixes.
Fixed merge conflicts.