merge issue with storyboard