Fixed merge conflicts with view elements on storyboard