Add conflict_resolution
input
#640
backport.yml
on: issue_comment
Backport pull request
0s
conflict_resolution
input
#640