Faulty rebase?