Merge branch '330243-update-fork-new-improvements' into 'master'

Change copy for the conflicts modal

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



Merged-by: Phil Hughes <me@iamphill.com>
Approved-by: Phil Hughes <me@iamphill.com>
Approved-by: Tomas Vik <tvik@gitlab.com>
Co-authored-by: Nataliia Radina <nradina@gitlab.com>