Resolved roughly half of pbxproj file conflicts.