Merge branch '227257-replace-bootstrap-popover-with-gitlab-ui-popover-in-merge-conflict-widget' into 'master'

Replace Bootstrap popover with GitLab UI popover for merge conflict

See merge request gitlab-org/gitlab!55652