Bug#1106186: Merge request adding conflicts tag

[Jorge Merlino]

On Fri, 12 Dec 2025 18:29:41 -0300 Jorge Merlino 
<jorge.merl...@canonical.com> wrote:
Hi folks,

Can any of you review this pull request? It has been waiting for a while.
Kindly asking again if anyone can review this PR.

Thanks
Jorge