rebase fix for windows