Everybody at one point in their lives has found themselves dealing with some sort of conflict, whether through internal or external means. I have found that just as everybody has had some sort of conflict, everybody also has different ways of dealing with it. Some people like to avoid conflict, some prefer to face it head on. We all have to understand that everybody has a different style with how they handle conflict, and this is what can lead to problems, when somebody is unaware and disagrees with the way somebody chooses to handle it.
My boss likes to say that it is always good to maintain 24 hours without addressing an issue with somebody else on the staff so that tensions are not as heightened and emotions are under control. I definitely recommend using this approach because it allows you to cool off versus saying something that you may later regret.
We also have to realize that there are some things that are just simply out of our control. For example, you can't control the way somebody else reacts. Although we wish we were able to control peoples thoughts sometimes, we have to remember that we are all blessed with the gift of free will and have the choice to believe what we want. Since we have the power to believe what we want to believe, we shouldn't be surprised when somebody has a different opinion than our own. In saying this, it is our choice to take what somebody says which we are in disagreement with and either take it personally or level headed.
Furthermore, we have to remember that everybody has a bad day sometimes, and their attitude or tone may not be the norm, but just a function of the crappy day they have had. We can not control somebody else's variables in their life, and we need to take this into consideration when we are looking to address any conflict. I have always lived my life according to what society considers to be the golden rule, treat people how you want to be treated. You never know when someone is having a bad day, and you could be the catalyst to setting them off. In this case they may say something in which they regret, and they have then damaged their relationship with you.
Generally I think that it is always smart to take a day to decompress and recollect your thoughts, before you ever try to call somebody out on a problem, not only will you be level headed, but you will be able to say what you want to say in a more convincing way than if it were in the reverse. You have the power to control your thoughts, and how you let other people's differing thoughts and opinions affect you. Take control of your thoughts and take initiative when it comes to conflict, I guarantee you that you both will feel so much better having came to a consensus.