Changed welcome text
Merged the welcome text conflict