UI changes for detection of conflicts caused by external updates to underlying entity of auto-save entry
>>> [!note] Migrated issue
<!-- Drupal.org comment -->
<!-- Migrated from issue #3585970. -->
Reported by: [f.mazeikis](https://www.drupal.org/user/3513671)
Related to !945
>>>
<h3 id="overview">Overview</h3>
<p>We are adding "Conflict resolution UI". This is the first task of the many and will add basic UI elements based on designs (meta issue with designs pending).</p>
<h3 id="proposed-resolution">Proposed resolution</h3>
<p>Add “Selective publishing error” UI element to the “Selective publishing dropdown” panel.<br>
Add a CTA button intended to open conflict resolution UI that also contains conflict counter.</p>
<h3 id="ui-changes">User interface changes</h3>
<p>When a "resolvable conflict" is detected in Canvas UI, the following UI elements become available:</p>
<ol>
<li>A div with specific styling and colour identifying conflict detection</li>
<li>Label with conflict counter</li>
<li>A CTA button intended to open conflict resolution UI that also contains conflict counter.</li>
</ol>
<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'>
</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>Conflict resolution CTA section in "Review changes" panel:<br><br>
<img src="https://www.drupal.org/files/issues/2026-04-29/Conflict%206%20-%20CTA%20in%20review%20changes.png" alt="Design for the conflict resolution CTA inside of the review changes dropdown">
</li>
</ol>
> Related issue: [Issue #3587587](https://www.drupal.org/node/3587587)
issue