revert-or-swallow -> keep/revert