Conflict in the workplace is a natural occurance of interacting with one another and cost of resolving conflict is relative to the cost of leaving clnflicts unresolved.  Although it is best to determine whether it is a long or short term working relationship when deciding whether or not to addresses.  In all instances in conflict resolution it is always best to work on your listening skills to be objective, empathic and open to trying to understand the other person's feelings and underlying issues that may change the dynamics of each situation.