Merge branch '1495-ppr-conflict-bage-cleanup' into 'main'
added spacing after tertiary name list so conflicts badge has more room, hide...
See merge request !891 (merged)
(cherry picked from commit 851865a3)
c70d0bbb added spacing after tertiary name list so conflicts badge has more room, hide...