fixes merge conflict markers #18334

Job	Run time
Lint with OpenDream	44s
Compile Maps	39s
Find Maps to Test	8s
Windows Build	1m 20s
Run Linters	1m 57s
Unit Tests (corsat) / run_unit_tests	1m 28s
Unit Tests (bigredv2) / run_unit_tests	55s
Unit Tests (almayer) / run_unit_tests	51s
Unit Tests (desert_dam) / run_unit_tests	1m 5s
Unit Tests (chinook) / run_unit_tests	56s
Unit Tests (fiorina_sciannex) / run_unit_tests	1m 13s
Unit Tests (ice_colony_v2) / run_unit_tests	57s
Unit Tests (kutjevo) / run_unit_tests	49s
Unit Tests (lv522_chances_claim) / run_unit_tests	48s
Unit Tests (lv624) / run_unit_tests	1m 12s
Unit Tests (new_varadero) / run_unit_tests	51s
Unit Tests (prison_station_fop) / run_unit_tests	1m 7s
Unit Tests (runtime) / run_unit_tests	1m 10s
Unit Tests (shivas_snowball) / run_unit_tests	53s
Unit Tests (sorokyne_strata) / run_unit_tests	1m 19s
Unit Tests (whiskey_outpost_v2) / run_unit_tests	59s
Alternate Tests (515, 1610, lv624) / run_unit_tests	1m 7s
Check Alternate Tests	0s
	22m 28s

Provide feedback