ironing out the conflict Synonym