---
sourceDocument: Xanadu ServiceNow AI Platform Administration
sourceDocumentLink: https://servicenow-prod.fluidtopics.net/r/xanadu/platform-administration

 Release :

    - xanadu

ft:locale :

    - en-US

ft:publication_title :

    - Xanadu ServiceNow AI Platform Administration

ft:clusterId :

    - platadm

bundleId :

    - platadm

workflow :

    - Platform


---

# Resolve conflicts for an individual record

# Resolve conflicts for an individual record {#ariaid-title1}

* Release version: Xanadu
* 
* Updated August 1, 2024
* 
* ![](https://www.servicenow.com/docs/portal-asset/ico-clock) 1 minute to read

Reconcile differences between your customized record and the changes associated with
the upgrade.

## Before you begin

Role required: admin

## Procedure

1. From the [Upgrade Details form](https://servicenow-prod.fluidtopics.net/d_GOOUNjb9b~vUH38nlEMg "From the Upgrade Details form, you can review an individual record affected by the upgrade and reconcile conflicts between the upgrade and customizations.") for the record you are reconciling, click Resolve Conflicts.  
   The system displays the [Resolve Conflicts form](https://servicenow-prod.fluidtopics.net/pyY4emWqr_NGvHEorLdFnw "The Resolve Conflicts form you compare to the base system version with the customized version of a record and reconcile the differences."), which highlights differences between the two versions of the record. The form displays information about the base system record on the left and the customized record on the right. {#upgrademon-resolve_conflicts__ajb_gyj_fx}
2. Compare the base system with the customized record for each field on this form, and for non-script fields, edit the customized record to include what you want from the base system and the customization. {#upgrademon-resolve_conflicts__uhh_jyj_fx}
3. If this record contains a script, check it for conflicts and resolve.
   1. Click inside the Script field.  
      The system displays the Resolve Conflicts - Script form highlighting areas where the two versions of the script differ. {#upgrademon-resolve_conflicts__c44_d1k_fx}
   2. Edit the script by clicking the small arrows that correspond to the blocks of code until script contains whichever content you want. {#upgrademon-resolve_conflicts__hml_g1k_fx}
   3. Click OK.  
      The system returns to the Resolve Conflicts form. {#upgrademon-resolve_conflicts__adx_cck_fx}
   {#upgrademon-resolve_conflicts__b44_d1k_fx} {#upgrademon-resolve_conflicts__l1f_c1k_fx}
4. To save your changes to the record, click Save Merge.  
   The system sets the Resolution for this record to Reviewed and Merged. {#upgrademon-resolve_conflicts__ksk_gck_fx}
* **[Upgrade Details form](https://servicenow-prod.fluidtopics.net/d_GOOUNjb9b~vUH38nlEMg)**   
  From the Upgrade Details form, you can review an individual record affected by the upgrade and reconcile conflicts between the upgrade and customizations.
* **[Resolve Conflicts form](https://servicenow-prod.fluidtopics.net/pyY4emWqr_NGvHEorLdFnw)**   
  The Resolve Conflicts form you compare to the base system version with the customized version of a record and reconcile the differences.

**Related topics**   

* [Compare to the current version](https://www.servicenow.com/docs/access?context=t_CompareToCurrentVersion&version=xanadu&pubname=xanadu-application-development&ft:locale=en-US)
* [Compare a pushed version to a local version](https://www.servicenow.com/docs/access?context=t_ComparePushedVerLocalVer&version=xanadu&pubname=xanadu-application-development&ft:locale=en-US)
* [Compare two versions of an article](https://www.servicenow.com/docs/access?context=compare-two-article-versions&version=xanadu&pubname=xanadu-servicenow-platform&ft:locale=en-US)
* [Resolve a collision in Team Development](https://www.servicenow.com/docs/access?context=t_ResolveACollision&version=xanadu&pubname=xanadu-application-development&ft:locale=en-US)
* [Revert a change](https://www.servicenow.com/docs/access?context=t_RevertAChange&version=xanadu&pubname=xanadu-application-development&ft:locale=en-US)
* [View customizations and compare with current version](https://www.servicenow.com/docs/access?context=view-customer-update-records&version=xanadu&pubname=xanadu-application-development&ft:locale=en-US)