conflictResolved