new start screen
merge conflict resolved