Trying to merge Master

project.pbxproj is causing an error