next/prev: fix a few bugs in --conflict
#7692
dependabot.yml
on: pull_request
Dependabot auto-merge
0s
--conflict
#7692