merging with osx