EDIT: The conflict is resolved
This is ultimately the state we always want to attain.
The one caveat we will menetion here is to look for patterns.
Resolutuion often involves compromise and promises.
If the same pattern continues to occur and you are regularly accommodating the other person,
recognize that they may be taking advantage of you and that you may need to alter the agreement
because they are nt holding up their part of the bargain.