Orlando, I have had the same problem I do not like conflict and it too led to the divorce. Conflict is unnecessary - communication is only resolved if both parties see the illusion at the same level which I have discovered means - a partner should have the same family values, moral, ethical and their conditioning must have a similar thread to yours. It is like having an understanding of one another on a level of experience that flows in the same direction. We instead are attracted to our opposites ying and yang, black and white, etc: Being our opposites will then create the misinterpretation of events that occur during our relationship - relating. dis-similar illusion.
Two people who are viewing the world based on their individual interpretation (illusion)created by long years of conditioning. Each will see events completely different even though you both appear to be living together and experiencing the event together at the same time.. Therefore because we love (which is blind) we assume (individually) that the other see's the world or the event as you do. If you are with an opposite the relationship is doomed. She will interprete a shared event completely different to you but you may assume she has seen it in the same way (she knows me - love) - therefore (miss - understanding) occurs ...this then creates an impossible situation and each fail to communicate to one another what the issue really is, because both cannot comprehend the others view. She and you cannot see beyond your or her understanding - both are convinced of their own view point and nothing can overcome belief. That would be to deny ones sanity. Crazy stuff. could go on but I think you may get it.
Have a willingness to change
Know that your opinion matters
Respect the other person
Remember that we all have strengths and deficits
Take the time to listen, I mean actively listen
Give appropriate feedback
Take time apart when necessary
Be aware of the messages that are sent or perceived via non verbal communication
Set ground rules when entering into conversation that may lead to tough topics