That's the question.  Here's the answer in just one word.  Communicate.  That takes grace and courage.  Ask God and he will tell you how to best communicate with the person on the other side of the conflict.