Change to the wording on the landing page
Resolve merge conflict.