fix conflict

Status Job ID Name Coverage
  Build
failed #3005
build

 
  Test
skipped #3007
allowed to fail
codequality
skipped #3006
test
 
Build build
No job trace