"Conflict resolved."