Techniques for Conflict Resolution
Control Your Anger
Use Effective Communication Skills
Talk it over.
Stick to the Conflict at Hand
Don't bring up past issues.
Attack the Problem, Not the Person
Negotiate the Solution
Everyone gives in a little; all are satisfied with the outcome.