rebase fix for mac