resolved conflicts

3 jobs for !27 with ibm_int_quick_fix in 16 minutes and 58 seconds (queued for 1 second)
merge request