Conflict Resolved for StoryBoard