Completed edit of introduction.
Merge conflict.