fixed storyboard's merge issue