resolve merge conflict

2 jobs for manon in 49 minutes and 52 seconds (queued for 8 seconds)
Status Name Job ID Coverage
  Build
passed mfbuild #86176

00:02:07

 
  Test
passed mftests #86177

00:47:44