Fixed storyboard resource conflicts