Please take this discussion in any direction you want to. Conflict resolution is a great skill to have in your toolkit but also a very difficult and complex one. Being able to develop a strategy (and a back-up strategy) is critical. Similar to having a plan A and a plan B. Always remember in a conflict situation what consequence you want to occur. If you engage properly, you can heavily influence (if not control) the outcome.
Below is a file which contains a hard copy version of a Conflict Resolution Style questionnaire. I would like for each of you to take it, score it, and use this a basis for your discussion. The two highest scores indicate your top two preferences that you will normally go to. You need to understand and be able to use all of the styles and more importantly, when to use each one. This is very similar in application to the Situational Leadership model.