Conflict resolution

Conflicts may occur when you are applying the new Service Manager changes to your existing Service Manager installation, which is likely to include customizations, tailoring, and patches. The conflict resolution phase of the upgrade is to reconcile the differences between the customized objects and the objects provided by the upgrade package.