Build merge commits on osx x86-64