One of my favorite teachers likes to remind people that when conflict occurs, the first person to make it to the heart wins. Of course, if you're jumping up and down shouting, "I made it to the heart! I won!" you didn't make it to the heart at all.
And if you're selling yourself out to avoid conflict, you're being unkind to yourself, and you didn't make it to the heart either.
The race to the heart is one of the greatest conflict resolutions techniques imaginable.
Oh, the ego is such a trickster! If you haven't downloaded my SpeakSTRONG Method Handbook, I invite you to. It makes some fine distinctions about ego and heart. It will help you win.