Restoring spalsh screen time
Resolving merge conflict