iron out the conflict Synonym