Merge branch 'pb-file-collection-kwargs' into 'master'

Fix Ruby 2.7 deprecation warnings for Conflict::FileCollection

See merge request gitlab-org/gitlab!43679

lib/gitlab/conflict/file_collection.rb

@@ -21,11 +21,13 @@ module Gitlab
       def resolve(user, commit_message, files)
         msg = commit_message || default_commit_message
         resolution = Gitlab::Git::Conflict::Resolution.new(user, files, msg)
-        args = {
+
+        resolver.resolve_conflicts(
+          @source_repo,
+          resolution,
           source_branch: merge_request.source_branch,
           target_branch: merge_request.target_branch
-        }
-        resolver.resolve_conflicts(@source_repo, resolution, args)
+        )
       ensure
         @merge_request.clear_memoized_shas
       end