fixes merge conflict markers #18338

Job	Run time
Lint with OpenDream	45s
Compile Maps	1m 3s
Find Maps to Test	13s
Run Linters	2m 5s
Windows Build	1m 8s
Unit Tests (bigredv2) / run_unit_tests	6m 15s
Unit Tests (almayer) / run_unit_tests	6m 4s
Unit Tests (corsat) / run_unit_tests	6m 33s
Unit Tests (desert_dam) / run_unit_tests	6m 50s
Unit Tests (ice_colony_v2) / run_unit_tests	5m 53s
Unit Tests (chinook) / run_unit_tests	6m 8s
Unit Tests (fiorina_sciannex) / run_unit_tests	7m 1s
Unit Tests (kutjevo) / run_unit_tests	6m 55s
Unit Tests (lv624) / run_unit_tests	6m 46s
Unit Tests (new_varadero) / run_unit_tests	6m 28s
Unit Tests (lv522_chances_claim) / run_unit_tests	6m 43s
Unit Tests (prison_station_fop) / run_unit_tests	6m 51s
Unit Tests (runtime) / run_unit_tests	6m 11s
Unit Tests (shivas_snowball) / run_unit_tests	6m 12s
Unit Tests (sorokyne_strata) / run_unit_tests	6m 42s
Unit Tests (whiskey_outpost_v2) / run_unit_tests	6m 26s
Alternate Tests (515, 1610, lv624) / run_unit_tests	5m 44s
Check Alternate Tests	1s
	1h 54m 57s

Provide feedback