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!
Compromises had to be made to resolve the conflict over the school dress code.
Since you never said what "said conflict" might be, we cannot answer the question.
If I have an inner conflict about what to do with my life, I could easily forget that conflict as my life changes. If I have a conflict with a friend, I might forget all about it after a while. But if my friend dies before we resolve the conflict, that could become a problem. Conflicts are more easily forgotten unless another more serious issue occurs, People rarely forget their grief. If they try to bury it, it will usually come up later.
The conflict is that she has synesthesia
Dobal trump
Not understanding the cause.