merge: Move welcome screen