Rewrite Javadoc of Generic.
Conflict resolution.
Change of API Generic.
Conflict resolution.