Rebase... again.  Here we go again. Round two