discreet- careful and circumspect in one's speech or actions, especially in order to avoid causing offense or to gain an advantage.
"we made some discreet inquiries"
The resolution occurs when the conflict is resolved.
Never watched it but I am just going to say the FAT CAT lol
