splash screen
fixed merge conflics