clear up the conflict Synonym