disp confirm and pending edits
conflict