"Conflict resolved. Conflict resolved."