straightening out the conflict Synonym