On branch ios_port - fixed the merge conflicts and untrack and remove xcode intermediate files