Update documentation.
Fix merging conflict.