Mergin macdev branch for mac os support