Merge change. May need to modify pbxproj file to parse correctly