Splashscreen Login
Conflicts fixed