resolve storyboard conflict