Fixes git rebase issues