changes in activity_startup_screen xml
fixed merge conflicts