resolve the conflict

Status Job ID Name Coverage
  Build
canceled #2068
build

 
  Test
canceled #2070
allowed to fail
code_quality

canceled #2069
test