Merge branch '44564-error-500-while-attempting-to-resolve-conflicts-due-to-utf-8-conversion-error' into 'master'

Resolve "Error 500 while attempting to resolve conflicts due to UTF-8 conversion error"

Closes #44564

See merge request gitlab-org/gitlab-ce!17962