If there is conflict within the team, at first it must be made a solid diagnostic of the situation - to find out what is happening, why is happening and who is involved on it. This way, an accurate correction can be taken into action. Once the diagnostic is made, it will be time to question the parts involved on how they feel about the conflict and what can be done to resolve it. In some occasions, a third party will be a valuable addition so a more unbiased opinion can be taken into consideration. The resolution for the conflict hopefully will be achieved once both parties can express their concerns and achieve a common ground on the issue. In case that doesn't happen, the company might have to separate these team members into different teams or even let go one of the employees so the order can be reestablished on the workplace