Friction in the workplace can be stressful and counterproductive for everyone involved. Learn to approach the person with whom you are struggling and resolve the situation. Few steps to alleviate awkwardness in the workplace are to speak to the other person calmly, politely and rationally. Focus on the situation and facts, avoiding gossip and personal attacks. Be careful not to express hostility in your posture, facial expression or tone. Listen to the other person carefully. Communicate clearly what you want, offering positive suggestions and recommendations. Be willing to be flexible. Speak to your supervisor if a problem with a difficult co-worker seriously threatens your work, but avoid whining. These were some few steps to resolve conflicts at work. To know about more steps click the below link.
Reference: http://www.ehow.com/how_3820_resolve-conflicts-work.html
