Main.storyboard add
conflict fixed