Fix conflicts

29 jobs for r22mf in 10 minutes and 8 seconds (queued for 1 second)
Name Stage Failure
failed
test_configs Run
OK: trigger_minimal.json
OK: trigger_wp.json
OK: upgrade-HI.json
terminate called after throwing an instance of 'nlohmann::detail::parse_error'
what(): [json.exception.parse_error.101] parse error at line 24, column 31: syntax error while parsing object - unexpected string literal; expected '}'
/builds/mfernoux/training-dataset-dumper/build/x86_64-centos7-gcc11-opt/bin/test-configs-single-b: line 66: 185 Aborted (core dumped) test-config-parse-single-b $FILE &>$OUT
Error: upgrade.json!
Cleaning up project directory and file based variables
ERROR: Job failed: exit code 1

failed
test_upgrade Run
AthAlgEvtSeq                                        ERROR AthenaBaseComps/AthenaBaseComps/AthCommonDataStore.icc:43 (StatusCode AthCommonDataStore<PBASE>::sysInitialize() [with PBASE = AthCommonMsg<Gaudi::Sequence>]): code FAILURE: PBASE::sysInitialize()
AthMasterSeq ERROR Unable to initialize Algorithm AthSequencer/AthAlgEvtSeq
AthMasterSeq ERROR AthenaBaseComps/AthenaBaseComps/AthCommonDataStore.icc:43 (StatusCode AthCommonDataStore<PBASE>::sysInitialize() [with PBASE = AthCommonMsg<Gaudi::Sequence>]): code FAILURE: PBASE::sysInitialize()
AthenaEventLoopMgr ERROR Unable to initialize Algorithm: AthMasterSeq
AthenaEventLoopMgr ERROR Failed to initialize base class MinimalEventLoopMgr
ServiceManager ERROR Unable to initialize Service: AthenaEventLoopMgr
Py:ComponentAccumulator ERROR Failed to initialize AppMgr
Cleaning up project directory and file based variables
ERROR: Job failed: exit code 1