resolving the conflicts Synonym