renamed handlers to conflictResolution and changed imports accordingly