"Anyway, I trust that you've resolved your conflict?"