The first question to ask yourself is: Do you love this person enough to deal with some discomfort as you work through the issue? If the answer is no, there is no way you can live with this issue no matter what, and it’s never going to change, then you simply don’t care for this person enough to work it out.