Rebase against master and push and you're good - it'll kick off a new ci with a green basis