"Whenever you're in conflict with someone, there is one factor that can make the difference between damaging your relationship and deepening it. That factor is attitude."--William James
Whenever there is conflict with someone, allow the conflict to be a trigger to explore with curiosity what is at the root of the conflict, rather than engaging in a tug or war over which one of you is correct. If you approach the conflict knowing you both have valid points, then you strengthen your relationship by developing win/win solutions.