Fix display conflicts

added ⚠️ bug label

assigned to @benoit

created branch 9-fix-display-conflicts to address this issue

mentioned in merge request !9 (merged)

closed with commit f0752533

mentioned in commit f0752533