patch up the conflict Synonym