diseño principalmente
merge conflicts storyboard