Update tria documentation.
Resovle merge conflicts.