Updated the welcome screen.
fixed conflicts.