fix conflict

4 jobs for master in 4 minutes and 29 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Prepare
passed #98363
linux
deploy_to_ygopro_server

00:00:29

canceled #98364
linux
pack

00:04:29

canceled #98362
linux
redtext

00:04:29

 
  Deploy
canceled #98365
linux
upload_to_minio