resolving a altercation Synonym