Hot: conflictresolution