conflictresolution Tag