resolve conflict

Status Job ID Name Coverage
  Build
failed #2837
build

 
  Test
skipped #2839
allowed to fail
codequality
skipped #2838
test
 
Build build
No job trace