Update MainStoryboard.storyboard

fix merge conflict