3. Conflict management