testing rebasing stuff