fix conflict

Status Job ID Name Coverage
  Build
canceled #3098
build

 
  Test
canceled #3100
allowed to fail
codequality

canceled #3099
test