Fixed the project.pbxproj file that had random things added to it because of the merge.