resolve the altercation Synonym