---
title: Replace Bootstrap popover with GitLab UI popover for merge conflict
merge_request: 55652
author:
type: other