fix for conflict of project.pbxproj and updated with upstream.