Fixed merge issues in storyboard