welcome disappears
fixed conflicts