Resolving storyboard conflicts

Storyboard conflicts