chore(ci): add conflict resolver to Update Nock file workflow
#1449
ci.yml
on: pull_request
Testing chores
1m 43s
Matrix: build-and-test