@nonayadambidnes
I've seen my guys approach each other, hissing and snarling, with their fur standing on end. They sit facing each other with only inches separating their faces, eyes locked, and you KNOW this is going to be trouble. Then one VERY slowly reaches out with a paw and gently touches the nose of the other.
Somehow that resolves the conflict and they both wander away....