fix bad merge storyboard issue