fix up mac proj
xcode projects
merge