fix conflict id string

2 jobs for master in 31 seconds
Status Job ID Name Coverage
  Build
passed #27454
linux
build

00:00:20

 
  Deploy
passed #27455
linux
deploy_npm

00:00:11