Oss sync

re-sync fixing the bad conflict resolutions.