correcting bad rebase