New: conflictresolution