bad rebase?