ups, conflict solved