resolving the altercation Synonym