Merge branch 'ph/conflictsCheckoutModal' into 'master'

Fixes the check out branch button not working on the conflicts page

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/140243



Merged-by: Kushal Pandya <kushal@gitlab.com>
Approved-by: Kushal Pandya <kushal@gitlab.com>
Reviewed-by: Kushal Pandya <kushal@gitlab.com>
Co-authored-by: Phil Hughes <me@iamphill.com>