Resolve merge conflict.
Removed conflicting classpath file.
Added Splash screen to the App.