chore(ci): add conflict resolver to Update Nock file workflow
#766
+34
−10
Loading