Main_iPhone.storyboard file conflict resolved.