Fixed merge conflicts in storyboard