I really love your definition of conflict, especially the point where you mentioned that conflict is the absence of peace and a state of war.
It is very true that conflict is the absence of peace,, usually where there is conflict, you cannot find peace there.

Conflict can actually end completely,, but it depends on how it is been handled and it is also dependent on the parties involve as well.

Understanding is the number one and the best way to avoid conflict because, conflict is usually as a result of misunderstanding... therefore,, let ensure to understand each other better in order to avoid conflict either between team or individuals.

I wish you the very best in the contest dear friend😊