Update component /ui/merge-conflict-panel.reel/merge-conflict-panel.html