[stable-3.30] Nmc/1901 Conflict dialog#291

Open

surinder-tsys wants to merge 1 commit intostable-3.30from backport/nmc/62/stable-3.30

+762-7

Commits on Oct 9, 2024

Implemented MC code conflict dialog.
surinder-tsys
committed