The Merchandising conflict resolution feature warns you if the asset you used to create your working version has been changed and checked in by someone else. When you try to advance your project to the next task, Merchandising tells you that assets in your project are not up to date and does not allow you to advance the project until you resolve the conflicts between the two versions.

For example, suppose Ray adds an existing asset to a new project. You add the same asset to a different project. Ray edits his working version of the asset and deploys his project. The assets in his project are checked in and constitute a new base version of those assets. They now contain changes that the working versions in your project do not contain.