succesful storyboard conflict resolution