resolve the pending conflict Synonym