Recovery from bad storyboard merge.