Split Resolve() into CancelByDiscardItemAsync and CancelByMergeItemAsync