adjust the conflict Synonym