Fi rebase gone wrong