Fix merging with clang and when openmp is not used

Merge request reports

Loading