Fix conficts pull
Passed
Marilena Bandieramonte
created pipeline for commit
6b405a92
, finished
For magFieldOpt
37 minutes 20 seconds, queued for 3 seconds