pre rebase setup
Rebase prep