commit from osx -- should conflict with smartgit local repo