@conflictresolution