whoops sorry, the rebase has failed my bad.

You are definitely right.