{"revision":"c10276e953456835cdbb1f3a60d58ae1980be353","document":{"id":40116,"path":"platform-administration/upgrade-center/uc-resolve-conflict.md","title":"Resolve conflicts for an individual record","bundle":null,"doc_type":null,"release":"australia","body":"\n# Resolve conflicts for an individual record\n\nReconcile differences between your customized record and the changes associated with the upgrade.\n\n## Before you begin\n\nRole required: admin\n\n## Procedure\n\n1.  From the [Upgrade Details form](https://raw.githubusercontent.com/ServiceNow/ServiceNowDocs/australia/markdown/australia/platform-administration/upgrade-center/uc-upgrade-details-form.md) for the record you are reconciling, click **Resolve Conflicts**.\n\n    The system displays the [Resolve Conflicts form](https://raw.githubusercontent.com/ServiceNow/ServiceNowDocs/australia/markdown/australia/platform-administration/upgrade-center/uc-resolve-conflicts-form.md), 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.\n\n    **Note:** The system creates a new customer update record when you click **Resolve Conflicts**.\n\n2.  Compare the base system with the customized record for each field on this form.\n\n    For non-script fields, edit the customized record on the right-hand side to include what you want from the base system and the customization.\n\n3.  If this record contains a script, check it for conflicts and resolve.\n\n    1.  Click inside the Script field.\n\n        The system displays the Resolve Conflicts - Script form highlighting areas where the two versions of the script differ.\n\n    2.  Edit the right-hand side so that the script contains whichever content you want. To move a block of code from the left to right side, click the small arrows corresponding to that block in the middle column.\n    3.  Click **OK**.\n\n        The system returns to the Resolve Conflicts form.\n\n4.  To save your changes to the record, click **Save Merge**.\n\n    The system sets the **Resolution** for this record to **Reviewed and Merged**.\n\n\n"}}