checkpoint
conflict resolution
last minute
resolution