Each of you should look not only to your own interests, but also to the interests of others. Your attitude should be the same as that of Christ Jesus. ~ Philippians 2:4-5
There's no time like the present to resolve the differences you have with someone. Rarely will your differences improve on their own. Someone has to make the first move.
Pride tells us to hold that grudge, to keep the conflict boiling beneath the surface. Maybe today is the day you put on your pants and face it head on.
How to resolve conflict the right way? Be the first mover. Remain calm. Ask questions to understand their point of view. Listen to them.
However, sometimes it just doesn't work out. Not everyone wants it resolved. Agree to disagree and move on. In every situation, pray for God's spirit to fill your words, your ears, and your heart.