welcome page update
merge