This branch diverges from the current state of production server, which is at this point 00c223e, though someone has accidentally made a dumb commit on production server…
That said, you can merge and deploy this on production safely, and from now on we can track the production state in this branch.
Once master is in a stable state – we’ll probably have to overwrite the current state…and just force-push – which is typically bad but if we’re stable…it won’t matter.