resolve merge conflicts.

Status Job ID Name Coverage
  Build
passed #124206
build_job

00:00:06

failed #124088
build_job

00:00:04

 
  Sonar Analysis
passed #124089
sonaranalysis_job

00:00:18

 
  Failure
passed #124090
failure

00:00:02