reconciling a conflict Synonym