When conflict occurs:

You may have to do all 3 of these things depending on the conflict and how intense it is, but you should always talk it out after. If there is no clear resolution or if both parties don't feel heard, then tension will just keep building. You can't have an effective team with tension in the air. Talk it out, forgive, and move on.