Fixed iPhone Storyboard following merge issue