解决冲突

Status Job ID Name Coverage
  Build
canceled #15834
build

 
  Test
canceled #15837
allowed to fail
code_quality

canceled #15836
test