working welcomg screen
fixed conflicts
welcome screen and conflicts fixed