Added the splash screen
fixed conflicts