rebasing... how hard can it be.