I suck at rebasing