fix conflict

Status Job ID Name Coverage
  Build
failed #2491
build

 
  Test
skipped #2493
allowed to fail
codequality
skipped #2492
test
 
Build build
No job trace