Resolve Conflicts form The Resolve Conflicts form you compare to the base system version with the customized version of a record and reconcile the differences. Figure 1. Resolve Conflicts form FieldsThe fields this form displays depend on the type of record you are reconciling. The left column shows the records fields in the base system, including the proposed changes that are part of the upgrade. The right column shows the fields for your customized record.