Repaired conflics in project and storyboard