resolving an altercation Synonym