chore(ci): add conflict resolver to Update Nock file workflow (#766)

chore(ci): add conflict resolver to Update Nock file workflow (#766) #1478