Once I had a problem with my team-mate in college who was my partner in my field work assignment. We had a disagreement on how to present our project report.
I explained my point of view to her and asked her for her view point. I’ve found that when conflict occurs, it’s because of a failure to see both sides of the situation. At that point we found a compromise could be reached by incorporating both our ideas.