'delete'
'resolveconflit'