resolve merge conflicts.

8 jobs for <span class="ref-name">dev/BHM</span> in 161 minutes and 6 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Unit Test
passed #504299
linux
run_unit_tests_on_linux

00:01:12

21.0%
passed #504300
windows
run_unit_tests_on_windows

00:02:23

21.0%
 
  Deploy
manual #504301
linux allowed to fail manual
deploy_branch_on_linux
manual #504302
windows allowed to fail manual
deploy_branch_on_windows
 
  Integration Test
passed #504303
linux
run_scenario_files_on_linux

01:02:23

passed #504304
windows
run_scenario_files_on_windows

01:14:20

 
  Seed Test
passed #504305
linux
run_seed_test_on_linux

00:56:27

failed #504306
windows
run_seed_test_on_windows

01:24:22

 
Name Stage Failure
failed
run_seed_test_on_windows Seed Test
  File "Tools/ContinuousIntegration/run_seed_comparison_test.py", line 71, in <module>
raise RuntimeError("All scenarios have to pass for the seed test.")
RuntimeError: All scenarios have to pass for the seed test.
Uploading artifacts...
Runtime platform arch=amd64 os=windows pid=1812 revision=8bb608ff version=11.7.0
Tools/ContinuousIntegration/run_seed_comparison_test.d/output: found 103 matching files
WARNING: Failed to load system CertPool: crypto/x509: system root pool is not available on Windows
Uploading artifacts to coordinator... ok id=504306 responseStatus=201 Created token=8AgWJyEw
ERROR: Job failed: exit status 1