[osx] squash into xcode changes