conflict

A difference between the site or design data in your project and data for the same site or design in the data synchronization area. In addition, a conflict could arise from a difference between data for the same site or design on multiple controllers, or the introduction of new data on a controller.

Conflicts prompt you to resolve the inconsistency by choosing which data to use in both your project and on site controllers. Depending on your choice, either your project data or the data in the data synchronization area is updated, thereby resynchronizing them.