trying to fix unsuccesful merge

storyboard not working