3 way merge for osx