trying git config branch.macosx.remote
Merge branch 'master' into macosx