mergin Mac and Windows code