Homescreen intro text
Resolve merge conflicts