classic conflict events -> revert-or-swallow