fixing launch page
launch page
fixed merge conflicts