Commit your change, then do `git rebase -i <latest CB commit>`