If you need to overcome any growing tension today, approach the other person involved in a direct manner as early in the day as you can. Not only will it save you time, it will prevent more headaches. Someone who is throwing their weight around thinks that they have you intimidated to the point of complete obedience: and won't it be amusing when you show them that you can't be pushed around? Be firm, but polite. You know how to make your point without making anyone mad.