Conflicts removed in storyboard