Добрый день. Не подскажете по такой проблеме: при разрешении конфликтов

в запросе на слияние стал получать ошибку "Failed to save merge conflicts resolutions. Please try again!". В консоли браузера при этом выводит: "POST
***/-/merge_requests/2/resolve_conflicts
[HTTP/2 500 Internal Server Error 203ms]"
GitLab на своих мощностях, весь остальной функционал работает штатно. Как можно разрешить?

В логи гитлаба смотри

В логе "/var/log/gitlab/gitlab-rails/production.log" выходит следующая информация (извините, что так мало 😁): Gitlab::Git::CommandError (13:merging is not supported for file.): lib/gitlab/git/wraps_gitaly_errors.rb:24:in `rescue in wrapped_gitaly_errors' lib/gitlab/git/wraps_gitaly_errors.rb:6:in `wrapped_gitaly_errors' lib/gitlab/git/conflict/resolver.rb:30:in `resolve_conflicts' lib/gitlab/conflict/file_collection.rb:25:in `resolve' app/services/merge_requests/conflicts/resolve_service.rb:9:in `execute' app/controllers/projects/merge_requests/conflicts_controller.rb:66:in `resolve_conflicts' ee/lib/gitlab/ip_address_state.rb:10:in `with' ee/app/controllers/ee/application_controller.rb:45:in `set_current_ip_address' app/controllers/application_controller.rb:520:in `set_current_admin' lib/gitlab/session.rb:11:in `with_session' app/controllers/application_controller.rb:511:in `set_session_storage' lib/gitlab/i18n.rb:107:in `with_locale' lib/gitlab/i18n.rb:113:in `with_user_locale' app/controllers/application_controller.rb:502:in `set_locale' app/controllers/application_controller.rb:495:in `set_current_context' lib/gitlab/metrics/elasticsearch_rack_middleware.rb:16:in `call' lib/gitlab/middleware/memory_report.rb:13:in `call' lib/gitlab/middleware/speedscope.rb:13:in `call' lib/gitlab/database/load_balancing/rack_middleware.rb:23:in `call' lib/gitlab/middleware/rails_queue_duration.rb:33:in `call' lib/gitlab/etag_caching/middleware.rb:21:in `call' lib/gitlab/metrics/rack_middleware.rb:16:in `block in call' lib/gitlab/metrics/web_transaction.rb:46:in `run' lib/gitlab/metrics/rack_middleware.rb:16:in `call' lib/gitlab/jira/middleware.rb:19:in `call' lib/gitlab/middleware/go.rb:20:in `call' lib/gitlab/middleware/query_analyzer.rb:11:in `block in call' lib/gitlab/database/query_analyzer.rb:37:in `within' lib/gitlab/middleware/query_analyzer.rb:11:in `call' lib/gitlab/middleware/multipart.rb:173:in `call' lib/gitlab/middleware/read_only/controller.rb:50:in `call' lib/gitlab/middleware/read_only.rb:18:in `call' lib/gitlab/middleware/same_site_cookies.rb:27:in `call' lib/gitlab/middleware/basic_health_check.rb:25:in `call' lib/gitlab/middleware/handle_malformed_strings.rb:21:in `call' lib/gitlab/middleware/handle_ip_spoof_attack_error.rb:25:in `call' lib/gitlab/middleware/request_context.rb:15:in `call' lib/gitlab/middleware/webhook_recursion_detection.rb:15:in `call' config/initializers/fix_local_cache_middleware.rb:11:in `call' lib/gitlab/middleware/compressed_json.rb:44:in `call' lib/gitlab/middleware/rack_multipart_tempfile_factory.rb:19:in `call' lib/gitlab/middleware/sidekiq_web_static.rb:20:in `call' lib/gitlab/metrics/requests_rack_middleware.rb:79:in `call' lib/gitlab/middleware/release_env.rb:13:in `call'