where the conflict resolved
the easiest way to resolve conflict. To talk it out.
Peace by dialogue.
friendship.
Conflict Resolution - to resolve a conflict.
No!
Since you never said what "said conflict" might be, we cannot answer the question.
Compromises had to be made to resolve the conflict over the school dress code.
Dobal trump
Not understanding the cause.
inability to recognize the intensity
The conflict is that she has synesthesia