Finally back to point before rebase errors