storyboard merge fixes