"Don't confuse conflict with indecision, disagreement, stress or other common experiences that may cause, or be caused by, conflict.  These are not conflict and they are not best handled by conflict-resolution tools"
Daniel Dana, 2001

DEFINING CONFLICT

1. A state of open, often prolonged fighting; a battle or war.

2. A state of disharmony between incompatible or antithetical persons, ideas, or interests; a clash.

3. Psychology. A psychic struggle, often unconscious, resulting from the opposition or simultaneous functioning of mutually exclusive impulses, desires, or tendencies.

4. Opposition between characters or forces in a work of drama or fiction, especially opposition that motivates or shapes the action of the plot.

DEFINING RESOLUTION

1.  a resolve or determination: to make a firm resolution to dosomething.
2.  the act of resolving or determining upon an action or course of action, method, procedure, etc
3.  the mental state or quality of being resolved or resolute;firmness of purpose.
4.  the act or process of resolving or separating into constituentor elementary parts.

Conflict.  (n.d.) In American Heritage Dictionary.  Retrieved from http://www.answers.com/topic/conflict

Resolution.  (n.d.) In Dictionary.com.  Retrieved from http://dictionary.reference.com/browse/resolution