diplomatic resolution