Conflict Resolution

1. a. a state of opposition or hostilities.
   b. a fight or struggle.
2. a. the clashing of opposed principles etc.
   b. an instance of this.
3. [Psychological]
   a. the opposition of incompatible wishes or 
	 needs in a person.
   b. an instance of this.
   c. the distress resulting from this.