If the conflict is between team members, the easiest solution may be to change the composition of the team, separating the personalities that were at odds.
This can be done by removing one from the group, or doing something as simple as moving seating arrangements.
(ex. Research has shown that when known antagonists are seated directly across from each other, the amount of conflict increases. However, when they are seated side by side, the conflict tends to decrease)