Resolve conflicts for an individual record Reconcile differences between your customized record and the changes associated with the upgrade. Before you beginRole required: admin Procedure From the Upgrade Details form for the record you are reconciling, click Resolve Conflicts. The system displays the Resolve Conflicts form, 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. Compare the base system with the customized record for each field on this form. 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. If this record contains a script, check it for conflicts and resolve. Click inside the Script field. The system displays the Resolve Conflicts - Script form highlighting areas where the two versions of the script differ. 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. Click OK. The system returns to the Resolve Conflicts form. To save your changes to the record, click Save Merge. The system sets the Resolution for this record to Reviewed and Merged. Upgrade Details formFrom the Upgrade Details form, you can review an individual record affected by the upgrade and reconcile conflicts between the upgrade and customizations.Resolve Conflicts formThe Resolve Conflicts form you compare to the base system version with the customized version of a record and reconcile the differences.