Update SplashScreen.java

merge had an error