>>> [!note] Migrated issue <!-- Drupal.org comment --> <!-- Migrated from issue #3587526. --> Reported by: [ravi.maniyar.123](https://www.drupal.org/user/3867193) Related to !1018 >>> <p><strong>Overview:</strong><br> Whenever conflicts occur, we need to show the file name with indicator and with different styling. The file with conflicts cannot be selected for publish. This issue will only add this functionality for Canvas UI.<br> There will be separate issue that will ensure conflict detection is performed during publishing of entities in similar fashion validation is performed.</p> <p><strong>User interface changes:</strong></p> <p>-- Item with a conflict has indicator icon<br> -- Item with a conflict is marked in red<br> -- Item with a conflict cannot be selected to publish, until the conflict has been resolved<br> -- If the item was previously selected to be published and the conflict is detected, the item should be unselected automatically<br> -- A &ldquo;Resolve conflict&rdquo; link will be added to the vertical dot dropdown menu on the file within the publish dropdown<br> -- When tapped on &ldquo;Resolve conflicts&rdquo; a panel would open to let user see the comparisons side by side and that will be covered in different ticket. </p> <h4>Designs</h4> <p>All designs made by <a href="https://www.drupal.org/u/mark-dodgson">@mark-dodgson</a> and exported as PNGs from Figma.</p> <ol> <li>Conflict detected CTA and marked entities in the "Review changes" panel:<br><br> <img src="https://www.drupal.org/files/issues/2026-04-29/Conflict%205%20-%20review%20changes%20dropdown.png" alt='Design for the "Review changes" panel when conflicts are detected within the Canvas UI' width="800" height="400"> </li> <li>"Review changes" panel section:<br><br> <img src="https://www.drupal.org/files/issues/2026-04-29/Review%204%20-%20rewview%20changes%20dropdown%20section_0.png" alt='Design for just the "Review changes" panel when conflicts are detected'> </li> <li>Entity list with one entity marked as conflict detected:<br><br> <img src="https://www.drupal.org/files/issues/2026-04-29/Conflict%207%20-%20entity%20with%20conflict%20in%20list.png" alt="Design just the entity list changes in review changes dropdown"> </li> </ol> > Related issue: [Issue #3587587](https://www.drupal.org/node/3587587)