On branch mergify/bp/8.x/pr-529
Your branch is up to date with 'origin/8.x'.

You are currently cherry-picking commit b338474.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/scala-steward.conf

no changes added to commit (use "git add" and/or "git commit -a")