tweaking splash screen
fixed conflicts
njflsfdjlsf