merge mac and windows