Readding last merge as last revert was unintended. Sorry for the trouble.