Update Javadoc.
Conflict resolution.