rebase fix for Mac