last of revert-merge snaffu